refs #100823 Move android build to using target 'with-bcp' rather than

'honeycomb'

Author: David J. Kordsmeier

android/CCNx-Android-Services/Makefile

@@ -36,7 +36,7 @@ TARGET = $(BIN)/$(APK_NAME)
 
 default all: $(TARGET) 
 
-honeycomb: clean bcprov default
+with-bcp: clean bcprov default
 
 bcprov:
 	./download.sh libs http://repo2.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.43 bcprov-jdk16-1.43.jar

android/Makefile

@@ -50,7 +50,7 @@ install uninstall:
 	(cd CCNx-Android-Services && $(MAKE) $@)
 	(cd apps && $(MAKE) $@)
 
-honeycomb:
+with-bcp:
 	(cd external && $(MAKE) -j 1)
 	(cd CCNx-Android-Lib && $(MAKE))
 	(cd CCNx-Android-Services && $(MAKE) $@)

android/README

@@ -3,7 +3,7 @@ Building
 
 * First 'make' the top level ccn project
 * cd android
-* make (or make honeycomb)
+* make (or make with-bcp)
 * make install
 
 (Please see "Android Build System Notes" below for extended details on building CCN for Android.)
@@ -132,7 +132,7 @@ Honeycomb and Ice Cream Sandwich
 ================================
 Android 3.x & 4.x devices (and possibly some 2.x) devices the crypto support includes a subset of the Bouncy Castle library.  See: http://redmine.ccnx.org/issues/100589 for details.  As a result, the 3.x & 4.x devices we tested failed with ClassNotFoundException trying to resolve the BouncyCastleProvider.  To work around this, we include the Bouncy Castle provider jar file if you specify in the top level of the android project directory:
 
-make honeycomb
+make with-bcp
 
 This change affects CCNx-Android-Services, CCNx-Android-Chat, and CCNx-Android-StartupExamples.  Because of the size of the jar file (around 1.5mb) we are interested in a better solution long term, though there is no indication Google has changed their approach, except to enhance the android crypto library to rely upon functionality delivered through OpenSSL.
 

android/apps/CCNx-Android-Chat/Makefile

@@ -40,7 +40,7 @@ SRC = 	./src/org/ccnx/android/apps/chat/CcnxChatMain.java \
 
 default all: $(TARGET) 
 
-honeycomb: clean bcprov default
+with-bcp: clean bcprov default
 
 bcprov:
 	./download.sh libs http://repo2.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.43 bcprov-jdk16-1.43.jar

android/apps/CCNx-Android-StartupExamples/Makefile

@@ -40,7 +40,7 @@ SRC = 	./src/org/ccnx/android/examples/startup/BlockingStartup.java \
 
 default all: $(TARGET) 
 
-honeycomb: clean bcprov default
+with-bcp: clean bcprov default
 
 bcprov:
 	./download.sh libs http://repo2.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.43 bcprov-jdk16-1.43.jar

android/apps/Makefile

@@ -29,9 +29,9 @@ install uninstall:
 		(cd "$$f" && pwd && $(MAKE) $@) || exit 1; \
 	done
 
-honeycomb:
+with-bcp:
 	for f in $(SUBDIRS); do \
-		(cd "$$f" && pwd && $(MAKE) honeycomb $@) || exit 1; \
+		(cd "$$f" && pwd && $(MAKE) with-bcp $@) || exit 1; \
 	done
 
 clean distclean: