commit 89e35e5ca9bbe28bf5b9db6e4c80aeb86fc62095
author David Brazdil <dbrazdil@google.com> Fri Aug 31 09:59:39 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 31 09:59:39 2018 +0000
tree 55ba5b90eb0cf0f8ec5cb6e3c2d72219eb2ff92b
parent b1230b608f587ab97b5161bcd75026a1a4427f8a
parent b1082818b3182288c66a1359dd478cec039317e0

Merge "Encode use of private API in manifest"

core/android_manifest.mk

diff --git a/core/android_manifest.mk b/core/android_manifest.mk
index 13da10c..d1cfe15 100644
--- a/core/android_manifest.mk
+++ b/core/android_manifest.mk
@@ -58,10 +58,14 @@
 $(fixed_android_manifest): PRIVATE_EXPORTED_SDK_LIBS_FILE := $(my_exported_sdk_libs_file)
 $(fixed_android_manifest): $(my_exported_sdk_libs_file)
 
-$(fixed_android_manifest): PRIVATE_MANIFEST_FIXER_FLAGS :=
+my_manifest_fixer_flags :=
 ifneq ($(LOCAL_MODULE_CLASS),APPS)
-$(fixed_android_manifest): PRIVATE_MANIFEST_FIXER_FLAGS := --library
+    my_manifest_fixer_flags += --library
 endif
+ifeq ($(LOCAL_PRIVATE_PLATFORM_APIS),true)
+    my_manifest_fixer_flags += --uses-non-sdk-api
+endif
+$(fixed_android_manifest): PRIVATE_MANIFEST_FIXER_FLAGS := $(my_manifest_fixer_flags)
 $(fixed_android_manifest): $(MANIFEST_FIXER)
 $(fixed_android_manifest): $(main_android_manifest)
 	@echo "Fix manifest: $@"