diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2018-02-04 14:48:34 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2018-02-04 14:48:34 +0000 |
| commit | 3bf94292bbc68b63f598f9b9bc9039be85938082 (patch) | |
| tree | 80042fcf088b34def560308e5ce57a963b290593 /Android.mk | |
| parent | c4b731b944b2ceac546459873a54569f209dfc0f (diff) | |
| download | art-3bf94292bbc68b63f598f9b9bc9039be85938082.tar.gz art-3bf94292bbc68b63f598f9b9bc9039be85938082.tar.bz2 art-3bf94292bbc68b63f598f9b9bc9039be85938082.zip | |
Create dummy hidden api files for golem.
Change-Id: Idc419193f7fdfb2210f5517ad0e259cdb07e870c
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 0a90a0bb24..6928d03cce 100644 --- a/Android.mk +++ b/Android.mk @@ -460,11 +460,20 @@ 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: dex2oat dalvikvm patchoat linker libstdc++ \ +build-art-target-golem: build-art-target-golem-hiddenapi \ + dex2oat dalvikvm patchoat linker libstdc++ \ $(TARGET_OUT_EXECUTABLES)/art \ $(TARGET_OUT)/etc/public.libraries.txt \ $(ART_TARGET_DEX_DEPENDENCIES) \ @@ -472,8 +481,8 @@ build-art-target-golem: dex2oat dalvikvm patchoat linker libstdc++ \ $(ART_TARGET_SHARED_LIBRARY_BENCHMARK) \ $(TARGET_CORE_IMG_OUT_BASE).art \ $(TARGET_CORE_IMG_OUT_BASE)-interpreter.art - 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. + sed -i '/libartd.so/d' $(TARGET_OUT)/etc/public.libraries.txt ######################################################################## # Phony target for building what go/lem requires on host. |