diff options
| -rw-r--r-- | Android.mk | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/Android.mk b/Android.mk index 6928d03cce..0a90a0bb24 100644 --- a/Android.mk +++ b/Android.mk @@ -460,20 +460,11 @@ build-art-target: $(TARGET_OUT_EXECUTABLES)/art $(ART_TARGET_DEPENDENCIES) $(TAR ######################################################################## # Phony target for only building what go/lem requires for pushing ART on /data. - -# Create dummy hidden API lists which are normally generated by the framework -# but which we do not have in the golem manifest. -.PHONY: build-art-target-golem-hiddenapi -build-art-target-golem-hiddenapi: - mkdir -p ${TARGET_OUT_COMMON_INTERMEDIATES}/PACKAGING - touch ${TARGET_OUT_COMMON_INTERMEDIATES}/PACKAGING/hiddenapi-{blacklist,dark-greylist,light-greylist}.txt - .PHONY: build-art-target-golem # Also include libartbenchmark, we always include it when running golem. # libstdc++ is needed when building for ART_TARGET_LINUX. ART_TARGET_SHARED_LIBRARY_BENCHMARK := $(TARGET_OUT_SHARED_LIBRARIES)/libartbenchmark.so -build-art-target-golem: build-art-target-golem-hiddenapi \ - dex2oat dalvikvm patchoat linker libstdc++ \ +build-art-target-golem: dex2oat dalvikvm patchoat linker libstdc++ \ $(TARGET_OUT_EXECUTABLES)/art \ $(TARGET_OUT)/etc/public.libraries.txt \ $(ART_TARGET_DEX_DEPENDENCIES) \ @@ -481,8 +472,8 @@ build-art-target-golem: build-art-target-golem-hiddenapi \ $(ART_TARGET_SHARED_LIBRARY_BENCHMARK) \ $(TARGET_CORE_IMG_OUT_BASE).art \ $(TARGET_CORE_IMG_OUT_BASE)-interpreter.art - # remove libartd.so from public.libraries.txt because golem builds won't have it. sed -i '/libartd.so/d' $(TARGET_OUT)/etc/public.libraries.txt + # remove libartd.so from public.libraries.txt because golem builds won't have it. ######################################################################## # Phony target for building what go/lem requires on host. |