commit 2a935cb8aa580683e7b3ca790765c875a50e0257
author Tony Wickham <twickham@google.com> Wed Aug 19 20:46:12 2020 -0700
committer Tony Wickham <twickham@google.com> Fri Aug 21 19:06:29 2020 +0000
tree ac7394d290163617eb617d6fb2b7eaf3436c3a92
parent 039116e4b1f07f85a1de17e63cecdd516c6c8692
parent f6b4b198338ffcd91badab0ac534402d188ccb84

Merging from ub-launcher3-rvc-qpr-dev @ build 6777894

Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-rvc-qpr-dev_rvc-qpr-dev_6777894.html

Change-Id: Ic7b1cf59379402e125394f3fbe826c56c17d9fdd
Merged-In: Ia78f542e03f7d0adb49f3c06021824cf624ce376

Android.mk

diff --git a/Android.mk b/Android.mk
index 1813e99..430b443 100755
--- a/Android.mk
+++ b/Android.mk
@@ -90,7 +90,11 @@
 LOCAL_PROGUARD_ENABLED := disabled
 LOCAL_MANIFEST_FILE := AndroidManifest.xml
 
-LOCAL_SDK_VERSION := current
+ifneq (,$(wildcard frameworks/base))
+    LOCAL_PRIVATE_PLATFORM_APIS := true
+else
+    LOCAL_SDK_VERSION := current
+endif
 LOCAL_MODULE := WallpaperPicker2CommonDepsLib
 LOCAL_PRIVILEGED_MODULE := true