diff options
| author | Neil Fuller <nfuller@google.com> | 2015-06-29 10:12:51 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2015-06-29 11:52:20 +0100 |
| commit | e40f8ded5b78b68b992938c497309b6dbcd7f462 (patch) | |
| tree | a1f8a977a4a3a3f4d5250efd6d3ba8c68d31c256 | |
| parent | 1502d44b59da6390d9f7a5fe73f4e428e00deae7 (diff) | |
| download | vogar-marshmallow-mr1-release.tar.gz | |
Change build target for vogar to include building vogar.jarandroid-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-release
Now "make vogar" should be sufficient.
(cherry-picked from commit 956aa496a47f93e07c05ef305c298d744153d61b)
Change-Id: I571b6d45bef5f177d84620be35d795e9cc1b885c
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -20,13 +20,9 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := vogar.jar - LOCAL_MODULE_TAGS := optional - LOCAL_MODULE_CLASS := JAVA_LIBRARIES - intermediates := $(call local-intermediates-dir,COMMON) - LOCAL_SRC_FILES := $(call all-java-files-under, src/) LOCAL_JAVA_RESOURCE_DIRS := resources @@ -47,7 +43,6 @@ LOCAL_SDK_VERSION := 9 # because jack doesn't produce jar files for STATIC_JAVA_LIBRARIES, # and produces its own intermediate representation instead. LOCAL_JACK_ENABLED := disabled - include $(BUILD_STATIC_JAVA_LIBRARY) # Build dependencies. @@ -77,7 +72,7 @@ LOCAL_MODULE := vogar include $(BUILD_SYSTEM)/base_rules.mk -$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/bin/vogar-android | $(ACP) +$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/bin/vogar-android vogar.jar | $(ACP) @echo "Copy: $(PRIVATE_MODULE) ($@)" $(copy-file-to-new-target) $(hide) chmod 755 $@ |