Android.mk changes to produce statically linked apps for Android.

Author: erimatnor

android/Haggle/AndroidManifest.xml

@@ -3,8 +3,12 @@
 	  package="org.haggle.kernel"
 	  android:versionCode="1"
 	  android:versionName="0.4">
-  <application android:label="Haggle">
-    <service android:enabled="true" android:exported="true" android:name=".Haggle" />
+  <application android:label="Haggle"	       
+	       android:icon="@drawable/haggle_launch_icon" >
+    <service android:enabled="true" 
+	     android:exported="true" 
+	     android:name=".Haggle" 
+	     android:icon="@drawable/ic_stat_notify_haggle"/>
     <activity android:name="StatusView"
               android:label="@string/app_name">
       <intent-filter>

android/Haggle/jni/Android.mk

@@ -9,11 +9,3 @@ subdirs := $(addprefix $(APP_PROJECT_PATH)/../../,$(addsuffix /Android.mk, \
 EXTRA_LIBS_PATH := $(APP_PROJECT_PATH)/../extlibs/external
 
 include $(subdirs)
-
-#$(call __ndk_info,$(LOCAL_MAKEFILE):$(LOCAL_MODULE): subdirs are : $(subdirs))
-
-#$(call import-module,sqlite/dist)
-#$(call import-module,dbus)
-#$(call import-module,bluetooth/bluez)
-#$(call import-module,zlib)
-#$(call import-module,openssl/crypto)

android/Haggle/res/drawable-hdpi-v9/haggle_launch_icon.png

@@ -4,7 +4,8 @@
 	  android:versionCode="1"
 	  android:versionName="0.4">
   <application android:name=".PhotoShare" 
-	       android:label="@string/app_name" android:icon="@drawable/haggle_launch_icon">
+	       android:label="@string/app_name" 
+	       android:icon="@drawable/haggle_launch_icon">
     <!-- uses-library android:name="org.haggle"/ -->
     <activity android:name=".PhotoView"
 	      android:label="@string/app_name"

android/Haggle/res/drawable-hdpi/haggle_launch_icon.png

@@ -112,16 +112,16 @@ LOCAL_STATIC_LIBRARIES += \
 	libcpphaggle \
 	libhaggle-xml2
 
-EXTRA_DEFINES:= \
+LOCAL_DEFINES:= \
 	-DHAVE_CONFIG \
 	-DOS_ANDROID \
 	-DHAVE_EXCEPTION=0 \
 	-DENABLE_ETHERNET \
 	-DENABLE_BLUETOOTH \
-	-DDEBUG
+	$(EXTRA_DEFINES)
 
-LOCAL_CFLAGS :=-O2 -g $(EXTRA_DEFINES)
-LOCAL_CPPFLAGS +=$(EXTRA_DEFINES)
+LOCAL_CFLAGS :=-O2 -g $(LOCAL_DEFINES)
+LOCAL_CPPFLAGS +=$(LOCAL_DEFINES)
 LOCAL_LDFLAGS +=-L$(EXTRA_LIBS_PATH)/../libs/$(TARGET_ARCH_ABI)
 
 ifneq ($(BOARD_WLAN_TI_STA_DK_ROOT),)

android/PhotoShare/AndroidManifest.xml

@@ -15,13 +15,20 @@ LOCAL_SRC_FILES := \
 	Signal.cpp \
 	Reference.cpp
 
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/include $(LOCAL_PATH)/../utils
+LOCAL_C_INCLUDES += \
+	$(LOCAL_PATH)/include \
+	$(LOCAL_PATH)/../utils
 
 LOCAL_MODULE := libcpphaggle
 
-EXTRA_DEFINES:=-DHAVE_CONFIG -DOS_ANDROID -DHAVE_EXCEPTION=0 -DDEBUG -DDEBUG_LEAKS
-LOCAL_CFLAGS :=-O2 -g $(EXTRA_DEFINES)
-LOCAL_CPPFLAGS +=$(EXTRA_DEFINES)
+LOCAL_DEFINES := \
+	-DHAVE_CONFIG \
+	-DOS_ANDROID \
+	-DHAVE_EXCEPTION=0 \
+	$(EXTRA_DEFINES)
+
+LOCAL_CFLAGS :=-O2 -g $(LOCAL_DEFINES)
+LOCAL_CPPFLAGS +=$(LOCAL_DEFINES)
 
 include $(BUILD_STATIC_LIBRARY)
 

resources/HaggleLogo-512x512.png

@@ -25,9 +25,12 @@ LOCAL_C_INCLUDES += \
 LOCAL_SHARED_LIBRARIES := libdl liblog
 LOCAL_STATIC_LIBRARIES := libhaggle-xml2
 
-EXTRA_DEFINES=-DOS_ANDROID -DDEBUG
-LOCAL_CFLAGS :=-O2 -g -std=gnu99 $(EXTRA_DEFINES)
-LOCAL_CPPFLAGS +=$(EXTRA_DEFINES)
+LOCAL_DEFINES = \
+	-DOS_ANDROID \
+	$(EXTRA_DEFINES)
+
+LOCAL_CFLAGS :=-O2 -g -std=gnu99 $(LOCAL_DEFINES)
+LOCAL_CPPFLAGS +=$(LOCAL_DEFINES)
 
 LOCAL_PRELINK_MODULE := false