commit 8f2df8a94ffe21cd7b73f3178ef778f10c67b6c1
author Jiyong Park <jiyong@google.com> Fri Mar 23 17:29:05 2018 +0900
committer Jiyong Park <jiyong@google.com> Fri Mar 30 14:57:23 2018 +0900
tree 3c03a4a3a2500740bd7b172049bc18b6309d73a7
parent 6964add112adadfac4c59dddce1b21beeb570cfe

Don't build android.test.mock.stubs for unbundled builds

Unbundled builds use the prebuilt libs in /prebuilts/sdk/current and
system_current.

Bug: 73829976
Test: m -j ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk

Merged-In: I61fe0d671778595f49be82d7c11caffc411f58a3
Change-Id: I61fe0d671778595f49be82d7c11caffc411f58a3
(cherry picked from commit ea93a9ebc22d2685ecc94b0a51175ec7c6eb7d05)

test-mock/Android.bp

diff --git a/test-mock/Android.bp b/test-mock/Android.bp
index 9b70970..51fa86b 100644
--- a/test-mock/Android.bp
+++ b/test-mock/Android.bp
@@ -84,10 +84,24 @@
     name: "android.test.mock.stubs",
     srcs: [":android.test.mock.docs"],
     sdk_version: "current",
+    product_variables: {
+        unbundled_build: {
+            // Unbundled apps will use the prebuilt one
+            // prebuilts/sdk/current
+            enabled: false,
+        },
+    },
 }
 
 java_library_static {
     name: "android.test.mock.stubs-system",
     srcs: [":android.test.mock.docs-system"],
     sdk_version: "system_current",
+    product_variables: {
+        unbundled_build: {
+            // Unbundled apps will use the prebuilt one
+            // prebuilts/sdk/system_current
+            enabled: false,
+        },
+    },
 }