diff options
| author | Igor Murashkin <iam@google.com> | 2016-04-28 01:44:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-28 01:44:26 +0000 |
| commit | 61c5de62c488a0140ab6dd8a9ba7ec3ff9dcf95b (patch) | |
| tree | b8e7eeed21cb081dc749fbe52b39cc02dfbbec83 | |
| parent | 34a08fb10c189dc51d947902192d9735e02ca4bb (diff) | |
| parent | 3c281807bfef61b077cb2e010890c11be31feb6b (diff) | |
| download | guice-61c5de62c488a0140ab6dd8a9ba7ec3ff9dcf95b.tar.gz | |
build: Add device-side support for the AOSP.
am: 3c28180
* commit '3c281807bfef61b077cb2e010890c11be31feb6b':
build: Add device-side support for the AOSP.
Change-Id: Ie6f6842dd4d24d0bd8f312fc7d5f5ab12a4e3a3f
| -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 |