commit 9ef6c94c20985ffdc673dded1b3f708c5be79e40
author Winson Chung <winsonc@google.com> Mon Mar 16 21:07:10 2020 +0000
committer Jonathan Nieder <jrn@google.com> Tue Mar 17 23:22:45 2020 +0000
tree f53f2eee8e48253bbdd2cba0958088a17fc7ca65
parent 1804306786a1831b84575a6dc54b13d00a55f341

Revert^2 "Merging from ub-launcher3-master @ build 6294827"

1bf6938f399db2a78d4be735160262009811502b
Bug: 151611270
Change-Id: If4ca7f9a479a8b0b26c19fcaff2349dca9af8f41

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