commit 528ed5d513cb04d85daf9e0c32974d2d25fc9d90
author Keun young Park <keunyoung@google.com> Fri Dec 20 10:12:05 2019 -0800
committer Keun-young Park <keunyoung@google.com> Tue Jan 07 00:44:51 2020 +0000
tree e9f37d78b214b6b8482d9d6a6e0aead5630ce903
parent bd62b1a836bb6dbe4e3d2ea2f73de8e21a48afbb

Fix stub libraries to use only what is allowed

- android.car was linked by mistake and that allows building with hidden API
  even if stub libraries are used.
- apps using non-hidden APIs should use following libraries for car library
  instead of adding android.car to library:
  android.car-stubs: public API
  android.car-test-stubs: public + test API
  android.car-system-stubs: system API

Bug: 146596417
Test: build
Change-Id: I4d295e79711ba6e3df6b47faf896532fab6f4b47

car-lib/Android.bp

diff --git a/car-lib/Android.bp b/car-lib/Android.bp
index 9e0d166..6319d26 100644
--- a/car-lib/Android.bp
+++ b/car-lib/Android.bp
@@ -222,9 +222,7 @@
     srcs: [
         ":android.car-stub-docs",
     ],
-    libs: [
-        "android.car",
-    ],
+    sdk_version: "current",
     product_variables: {
         pdk: {
             enabled: false,
@@ -239,6 +237,7 @@
 java_library {
     name: "android.car-stubs-dex",
     static_libs: ["android.car-stubs"],
+    sdk_version: "current",
     product_variables: {
         pdk: {
             enabled: false,
@@ -252,9 +251,7 @@
     srcs: [
         ":android.car-system-stubs-docs",
     ],
-    libs: [
-        "android.car",
-    ],
+    sdk_version: "system_current",
     product_variables: {
         pdk: {
             enabled: false,
@@ -269,6 +266,7 @@
 java_library {
     name: "android.car-system-stubs-dex",
     static_libs: ["android.car-system-stubs"],
+    sdk_version: "system_current",
     product_variables: {
         pdk: {
             enabled: false,
@@ -277,14 +275,12 @@
     compile_dex: true,
 }
 
-java_library_static {
+java_library {
     name: "android.car-test-stubs",
     srcs: [
         ":android.car-test-stubs-docs",
     ],
-    libs: [
-        "android.car",
-    ],
+    sdk_version: "test_current",
     product_variables: {
         pdk: {
             enabled: false,
@@ -296,6 +292,7 @@
 java_library {
     name: "android.car-test-stubs-dex",
     static_libs: ["android.car-test-stubs"],
+    sdk_version: "test_current",
     product_variables: {
         pdk: {
             enabled: false,