diff options
| author | David Brazdil <dbrazdil@google.com> | 2018-08-06 21:00:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-06 21:00:04 +0000 |
| commit | 09480aa0cf12adbeaef5a664bd6e216f1e384bf0 (patch) | |
| tree | ac1a56a708b8cf40178970e7c4ebf48e54ff9ed4 | |
| parent | 451fa13fa6d89f7c7bf29017c537c093dc0c39fb (diff) | |
| parent | 7adbde4cd613f4122dec6e1131640a86a2838b59 (diff) | |
| download | build-09480aa0cf12adbeaef5a664bd6e216f1e384bf0.tar.gz | |
Merge "hiddenapi: Split stubs into public/system/test classpaths"
| -rw-r--r-- | core/dex_preopt.mk | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index e668248bfc..1b2ba60a24 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -100,23 +100,27 @@ HIDDENAPI_STUBS := \ $(call hiddenapi_stubs_jar,android.test.base.stubs) # System API stubs -HIDDENAPI_STUBS += \ +HIDDENAPI_STUBS_SYSTEM := \ $(call hiddenapi_stubs_jar,android_system_stubs_current) # Test API stubs -HIDDENAPI_STUBS += \ +HIDDENAPI_STUBS_TEST := \ $(call hiddenapi_stubs_jar,android_test_stubs_current) # Singleton rule which applies $(HIDDENAPI) on all boot class path dex files. # Inputs are filled with `hiddenapi-copy-dex-files` rules. -$(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST): \ - PRIVATE_HIDDENAPI_STUBS := $(HIDDENAPI_STUBS) +$(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST): PRIVATE_HIDDENAPI_STUBS := $(HIDDENAPI_STUBS) +$(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST): PRIVATE_HIDDENAPI_STUBS_SYSTEM := $(HIDDENAPI_STUBS_SYSTEM) +$(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST): PRIVATE_HIDDENAPI_STUBS_TEST := $(HIDDENAPI_STUBS_TEST) $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST): \ .KATI_IMPLICIT_OUTPUTS := $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) -$(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST): $(HIDDENAPI) $(HIDDENAPI_STUBS) +$(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST): $(HIDDENAPI) $(HIDDENAPI_STUBS) \ + $(HIDDENAPI_STUBS_SYSTEM) $(HIDDENAPI_STUBS_TEST) for INPUT_DEX in $(PRIVATE_DEX_INPUTS); do \ find `dirname $${INPUT_DEX}` -maxdepth 1 -name "classes*.dex"; \ done | sort | sed 's/^/--boot-dex=/' | xargs $(HIDDENAPI) list \ - $(addprefix --stub-dex=,$(PRIVATE_HIDDENAPI_STUBS)) \ + --stub-classpath=$(call normalize-path-list, $(PRIVATE_HIDDENAPI_STUBS)) \ + --stub-classpath=$(call normalize-path-list, $(PRIVATE_HIDDENAPI_STUBS_SYSTEM)) \ + --stub-classpath=$(call normalize-path-list, $(PRIVATE_HIDDENAPI_STUBS_TEST)) \ --out-public=$(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) \ --out-private=$(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST) |