diff options
| author | Nan Zhang <nanzhang@google.com> | 2018-07-23 19:00:35 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-23 19:00:35 -0700 |
| commit | 3b020fb5357e0403878c53bc3d52042ac32701cc (patch) | |
| tree | db593e856da0244c0bc4aeba88ddc680f39b8692 | |
| parent | ca61d5972645ff5200971d8a767057ea8b59ada4 (diff) | |
| parent | 9b17f9b33683757ae0ee0326411d1bd4fdf2e2a1 (diff) | |
| download | multidex-3b020fb5357e0403878c53bc3d52042ac32701cc.tar.gz | |
Fix the broken build: git_master/apps am: edc9c8d3e1 am: f087e881a1 am: 8bccbfb84a
am: 9b17f9b336
Change-Id: I9ceef83b50f83a27c9631bde15da42c415766b11
| -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, + }, + }, } |