commit 877990fece680f75330307cfb644fc31e678ffc0
author Dean Harding <deanh@google.com> Tue Apr 02 13:57:49 2019 -0700
committer Dean Harding <deanh@google.com> Tue Apr 02 13:59:34 2019 -0700
tree 0ee780e5fa1a15b13a1b4b4ae0f9df6fe4768357
parent e33a9f5ebdc699af86a14ea7149032d1b5373ec9

Make a separate build target for releasing car-lib.

We need a library that's dex'd for hiddenapi enforcement. And one that's
not dex'd for dropping into google3.

Bug: 123756920
Test: m dist
Change-Id: Ia20de9a92cfc0690e6525056738d7a4698ef39e9

car-lib/Android.bp

diff --git a/car-lib/Android.bp b/car-lib/Android.bp
index 2c8858a..4e211f9 100644
--- a/car-lib/Android.bp
+++ b/car-lib/Android.bp
@@ -201,7 +201,7 @@
     },
 }
 
-java_library_static {
+java_library {
     name: "android.car-stubs",
     srcs: [
         ":android.car-stub-docs",
@@ -214,13 +214,24 @@
             enabled: false,
         },
     },
-    compile_dex: true,
+    installable: false,
     dist: {
         targets: ["dist_files"],
     }
 }
 
-java_library_static {
+java_library {
+    name: "android.car-stubs-dex",
+    static_libs: ["android.car-stubs"],
+    product_variables: {
+        pdk: {
+            enabled: false,
+        },
+    },
+    compile_dex: true,
+}
+
+java_library {
     name: "android.car-system-stubs",
     srcs: [
         ":android.car-system-stubs-docs",
@@ -233,12 +244,23 @@
             enabled: false,
         },
     },
-    compile_dex: true,
+    installable: false,
     dist: {
         targets: ["dist_files"],
     }
 }
 
+java_library {
+    name: "android.car-system-stubs-dex",
+    static_libs: ["android.car-system-stubs"],
+    product_variables: {
+        pdk: {
+            enabled: false,
+        },
+    },
+    compile_dex: true,
+}
+
 java_library_static {
     name: "android.car-test-stubs",
     srcs: [
@@ -252,5 +274,16 @@
             enabled: false,
         },
     },
+    installable: false,
+}
+
+java_library {
+    name: "android.car-test-stubs-dex",
+    static_libs: ["android.car-test-stubs"],
+    product_variables: {
+        pdk: {
+            enabled: false,
+        },
+    },
     compile_dex: true,
 }