diff options
| author | 2018-04-07 00:06:22 +0000 | |
|---|---|---|
| committer | 2018-04-07 00:06:22 +0000 | |
| commit | cc69e238b54369d9b841175fc0bb26f7f5937451 (patch) | |
| tree | b0e016cd44e737cf9cc653523f90e73948a2bc89 | |
| parent | 6e49cd6ec95efd02d8a7f0dc6b1d796ef37fc092 (diff) | |
| parent | 177696278224434829b6a7a7bc0a3cdebe7ae19d (diff) | |
Merge "Fix overriding commands warnings/error"
| -rw-r--r-- | build/Android.gtest.mk | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index b483e5f6f2..be27869fe0 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -89,43 +89,59 @@ ART_TEST_TARGET_GTEST_EmptyUncompressed_DEX := $(basename $(ART_TEST_TARGET_GTES ART_TEST_HOST_GTEST_MultiDexUncompressed_DEX := $(basename $(ART_TEST_HOST_GTEST_MultiDex_DEX))Uncompressed$(suffix $(ART_TEST_HOST_GTEST_MultiDex_DEX)) ART_TEST_TARGET_GTEST_MultiDexUncompressed_DEX := $(basename $(ART_TEST_TARGET_GTEST_MultiDex_DEX))Uncompressed$(suffix $(ART_TEST_TARGET_GTEST_MultiDex_DEX)) +ifdef ART_TEST_HOST_GTEST_Main_DEX $(ART_TEST_HOST_GTEST_MainStripped_DEX): $(ART_TEST_HOST_GTEST_Main_DEX) cp $< $@ $(call dexpreopt-remove-classes.dex,$@) +endif +ifdef ART_TEST_TARGET_GTEST_Main_DEX $(ART_TEST_TARGET_GTEST_MainStripped_DEX): $(ART_TEST_TARGET_GTEST_Main_DEX) cp $< $@ $(call dexpreopt-remove-classes.dex,$@) +endif +ifdef ART_TEST_HOST_GTEST_Main_DEX $(ART_TEST_HOST_GTEST_MainUncompressed_DEX): $(ART_TEST_HOST_GTEST_Main_DEX) $(ZIPALIGN) cp $< $@ $(call uncompress-dexs, $@) $(call align-package, $@) +endif +ifdef ART_TEST_TARGET_GTEST_Main_DEX $(ART_TEST_TARGET_GTEST_MainUncompressed_DEX): $(ART_TEST_TARGET_GTEST_Main_DEX) $(ZIPALIGN) cp $< $@ $(call uncompress-dexs, $@) $(call align-package, $@) +endif +ifdef ART_TEST_HOST_GTEST_Main_DEX $(ART_TEST_HOST_GTEST_EmptyUncompressed_DEX): $(ZIPALIGN) touch $(dir $@)classes.dex zip -j -qD -X -0 $@ $(dir $@)classes.dex rm $(dir $@)classes.dex +endif +ifdef ART_TEST_TARGET_GTEST_Main_DEX $(ART_TEST_TARGET_GTEST_EmptyUncompressed_DEX): $(ZIPALIGN) touch $(dir $@)classes.dex zip -j -qD -X -0 $@ $(dir $@)classes.dex rm $(dir $@)classes.dex +endif +ifdef ART_TEST_HOST_GTEST_MultiDex_DEX $(ART_TEST_HOST_GTEST_MultiDexUncompressed_DEX): $(ART_TEST_HOST_GTEST_MultiDex_DEX) $(ZIPALIGN) cp $< $@ $(call uncompress-dexs, $@) $(call align-package, $@) +endif +ifdef ART_TEST_TARGET_GTEST_MultiDex_DEX $(ART_TEST_TARGET_GTEST_MultiDexUncompressed_DEX): $(ART_TEST_TARGET_GTEST_MultiDex_DEX) $(ZIPALIGN) cp $< $@ $(call uncompress-dexs, $@) $(call align-package, $@) +endif ART_TEST_GTEST_VerifierDeps_SRC := $(abspath $(wildcard $(LOCAL_PATH)/VerifierDeps/*.smali)) ART_TEST_GTEST_VerifierDepsMulti_SRC := $(abspath $(wildcard $(LOCAL_PATH)/VerifierDepsMulti/*.smali)) |