diff options
| author | Nan Zhang <nanzhang@google.com> | 2018-07-23 16:04:55 -0700 |
|---|---|---|
| committer | Nan Zhang <nanzhang@google.com> | 2018-07-23 16:04:55 -0700 |
| commit | edc9c8d3e1fb602ca9526be22929323d1414b031 (patch) | |
| tree | 3422dc1e03f6d31bcb45f2b09b5baa03d1bad10f | |
| parent | 2121bfabfe5ca97740d8d3c836781d5d3a53ee8a (diff) | |
| download | multidex-edc9c8d3e1fb602ca9526be22929323d1414b031.tar.gz | |
Fix the broken build: git_master/apps
Orignally the Make version doesn't build them for unbundled branches.
So turn off the build for these targets in Android.bp.
Test: N/A
Bug: b/70351683
Change-Id: Ia8924ad258254f7b23edfb792a11e4af7b6089ce
| -rw-r--r-- | instrumentation/Android.bp | 6 | ||||
| -rw-r--r-- | library/Android.bp | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/instrumentation/Android.bp b/instrumentation/Android.bp index ce90b2f..e342fa9 100644 --- a/instrumentation/Android.bp +++ b/instrumentation/Android.bp @@ -38,4 +38,10 @@ java_library_static { static_libs: [ "android-support-multidex", ], + product_variables: { + unbundled_build: { + // Don't build the library in unbundled branches. + enabled: false, + }, + }, } diff --git a/library/Android.bp b/library/Android.bp index 2f09070..bc82325 100644 --- a/library/Android.bp +++ b/library/Android.bp @@ -38,4 +38,10 @@ java_library_static { java_resources: [ ":android-support-multidex-version", ], + product_variables: { + unbundled_build: { + // Don't build the library in unbundled branches. + enabled: false, + }, + }, } |