diff options
| author | Igor Murashkin <iam@google.com> | 2016-04-01 14:22:51 -0700 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2016-04-26 17:05:56 -0700 |
| commit | 3c281807bfef61b077cb2e010890c11be31feb6b (patch) | |
| tree | b8e7eeed21cb081dc749fbe52b39cc02dfbbec83 | |
| parent | 34a08fb10c189dc51d947902192d9735e02ca4bb (diff) | |
| download | guice-3c281807bfef61b077cb2e010890c11be31feb6b.tar.gz | |
build: Add device-side support for the AOSP.android-wear-n-preview-3android-wear-n-preview-2android-wear-n-preview-1android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-preview-3android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
Bug: 27521545
Change-Id: Ic254894f7dc838e0529b6cd648838b51fea84d0d
(cherry picked from commit 83b7ddb6a7b4db66d57c35ceb51fdbbb8a922aff)
| -rw-r--r-- | Android.mk | 15 |
1 files changed, 12 insertions, 3 deletions
@@ -57,11 +57,22 @@ munge_host_jar := $(HOST_OUT)/framework/munge-host.jar munge_zip_location := lib/build/munge.jar # +# Target-side Dalvik build +include $(CLEAR_VARS) +LOCAL_SRC_FILES := # None. Everything is post-processed by munge. See below. +LOCAL_MODULE := guice +LOCAL_STATIC_JAVA_LIBRARIES := guava jsr330 +LOCAL_MODULE_CLASS := JAVA_LIBRARIES +munge_src_arguments := $(guice_src_files) +include $(LOCAL_PATH)/AndroidCallMunge.mk +include $(BUILD_STATIC_JAVA_LIBRARY) + + +# # Host-side Java build include $(CLEAR_VARS) LOCAL_SRC_FILES := # None. Everything is post-processed by munge. See below. LOCAL_MODULE := guice-host -LOCAL_MODULE_TAGS := optional LOCAL_STATIC_JAVA_LIBRARIES := guavalib jsr330-host munge_src_arguments := $(guice_src_files) @@ -74,7 +85,6 @@ include $(BUILD_HOST_JAVA_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := # None. Everything is post-processed by munge. See below. LOCAL_MODULE := guice-hostdex -LOCAL_MODULE_TAGS := optional LOCAL_STATIC_JAVA_LIBRARIES := guava-hostdex jsr330-hostdex LOCAL_MODULE_CLASS := JAVA_LIBRARIES munge_src_arguments := $(guice_src_files) @@ -101,7 +111,6 @@ munge_zipped_src_files := $(filter-out $(munge_zipped_unsupported_files),$(munge include $(CLEAR_VARS) LOCAL_SRC_FILES := # None because we get everything by unzipping the munge jar first. LOCAL_MODULE := munge-host -LOCAL_MODULE_TAGS := optional LOCAL_JAVA_LIBRARIES := junit LOCAL_MODULE_CLASS := JAVA_LIBRARIES # Unzip munge and build it |