commit 984e52f31d596840cfa51b1238e1c43d2e1918f8
author saberian <saberian@google.com> Tue Jun 05 18:23:53 2012 -0700
committer saberian <saberian@google.com> Tue Jun 05 18:23:53 2012 -0700
tree eac927df7c58672aefab78595f7860431d3f7682
parent cb4a1963f47f607164b7cfa5591c1223c19a3dec

Adding Aggregators and predcitor to the service
Android.mk is modified to build a static java for whole service

Change-Id: I25b0f55ce9693efb3c59b209d4f0cf5c07c47fe1

bordeaux/service/Android.mk

diff --git a/bordeaux/service/Android.mk b/bordeaux/service/Android.mk
index c49a6d6..f71bc85 100644
--- a/bordeaux/service/Android.mk
+++ b/bordeaux/service/Android.mk
@@ -1,21 +1,24 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_MODULE_TAGS := samples tests
+LOCAL_MODULE_TAGS := optional
 
 # Only compile source java files in this apk.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_SRC_FILES += \
         src/android/bordeaux/services/IBordeauxServiceCallback.aidl \
+        src/android/bordeaux/services/IAggregatorManager.aidl \
         src/android/bordeaux/services/ILearning_MulticlassPA.aidl \
+        src/android/bordeaux/services/IPredictor.aidl \
         src/android/bordeaux/services/ILearning_StochasticLinearRanker.aidl \
-        src/android/bordeaux/services/IBordeauxService.aidl
+        src/android/bordeaux/services/IBordeauxService.aidl \
 
 LOCAL_STATIC_JAVA_LIBRARIES := bordeaux_learners
+LOCAL_JNI_SHARED_LIBRARIES := libbordeaux
+LOCAL_REQUIRED_MODULES := libbordeaux
 
 LOCAL_PACKAGE_NAME := bordeaux
 
-LOCAL_SDK_VERSION := current
 
 include $(BUILD_PACKAGE)
 
@@ -29,13 +32,15 @@
 LOCAL_SRC_FILES += \
         src/android/bordeaux/services/IntFloat.java \
         src/android/bordeaux/services/StringFloat.java \
+        src/android/bordeaux/services/StringString.java \
         src/android/bordeaux/services/BordeauxClassifier.java \
         src/android/bordeaux/services/BordeauxRanker.java \
+        src/android/bordeaux/services/BordeauxPredictor.java \
+        src/android/bordeaux/services/BordeauxAggregatorManager.java \
         src/android/bordeaux/services/BordeauxManagerService.java \
-        src/android/bordeaux/services/IBordeauxLearner.java \
-        src/android/bordeaux/services/Learning_StochasticLinearRanker.java \
-        src/android/bordeaux/services/StochasticLinearRankerWithPrior.java \
         src/android/bordeaux/services/IBordeauxServiceCallback.aidl \
+        src/android/bordeaux/services/IAggregatorManager.aidl \
+        src/android/bordeaux/services/IPredictor.aidl \
         src/android/bordeaux/services/ILearning_MulticlassPA.aidl \
         src/android/bordeaux/services/ILearning_StochasticLinearRanker.aidl \
         src/android/bordeaux/services/IBordeauxService.aidl \
@@ -47,5 +52,29 @@
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
+## Building the whole Bordeaux service
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+# Only compile source java files in this apk.
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES += \
+        src/android/bordeaux/services/IBordeauxServiceCallback.aidl \
+        src/android/bordeaux/services/IAggregatorManager.aidl \
+        src/android/bordeaux/services/ILearning_MulticlassPA.aidl \
+        src/android/bordeaux/services/IPredictor.aidl \
+        src/android/bordeaux/services/ILearning_StochasticLinearRanker.aidl \
+        src/android/bordeaux/services/IBordeauxService.aidl \
+
+LOCAL_STATIC_JAVA_LIBRARIES := bordeaux_learners
+LOCAL_JNI_SHARED_LIBRARIES := libbordeaux
+
+LOCAL_JAVA_RESOURCE_DIRS := res
+LOCAL_MODULE := bordeaux_whole_service
+LOCAL_PROGUARD_ENABLED := disabled
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
 # Use the folloing include to make our test apk.
 include $(call all-makefiles-under,$(LOCAL_PATH))