diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-05-10 15:44:59 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-05-10 15:44:59 +0000 |
| commit | 462bc723027f0e3c70aa323a88b2c633c776c29b (patch) | |
| tree | 9cbe581ae1806697600b9766c6a0b5b82577df02 | |
| parent | 29c3ececd007a5eab6e8d89ba187388cc35b52fc (diff) | |
| parent | 9317a80e25f88098735f19628d9c3f731b366ef8 (diff) | |
| download | multidex-busytown-mac-infra-release.tar.gz | |
Snap for 11819167 from 9317a80e25f88098735f19628d9c3f731b366ef8 to busytown-mac-infra-releasebusytown-mac-infra-release
Change-Id: If1988dda6ac2ce9c5f9a3e76bf95638006511524
| -rw-r--r-- | instrumentation/Android.bp | 17 | ||||
| -rw-r--r-- | library/Android.bp | 20 |
2 files changed, 0 insertions, 37 deletions
diff --git a/instrumentation/Android.bp b/instrumentation/Android.bp index 7dda1cd..5a0cfb5 100644 --- a/instrumentation/Android.bp +++ b/instrumentation/Android.bp @@ -21,29 +21,12 @@ package { default_applicable_licenses: ["frameworks_multidex_license"], } -genrule { - name: "android-support-multidex-instrumentation-version", - // use srcs as dependencies, otherwise, this module won't be re-run - // during incremental build. - srcs: [ - "src/**/*.java", - ], - cmd: "echo \"git.version=`cd frameworks/multidex/instrumentation; git log --format=\"%H\" -n 1 || " + - "(echo git hash not available; exit 0)`\" > $(genDir)/android-support-multidex-instrumentation.version.txt", - out: [ - "android-support-multidex-instrumentation.version.txt", - ], -} - java_library_static { name: "android-support-multidex-instrumentation", sdk_version: "4", srcs: [ "src/**/*.java", ], - java_resources: [ - ":android-support-multidex-instrumentation-version", - ], static_libs: [ "android-support-multidex", ], diff --git a/library/Android.bp b/library/Android.bp index 44813a5..467761a 100644 --- a/library/Android.bp +++ b/library/Android.bp @@ -21,23 +21,6 @@ package { default_applicable_licenses: ["frameworks_multidex_license"], } -genrule { - name: "android-support-multidex-version", - tools: [ - "soong_zip", - ], - // use srcs as dependencies, otherwise, this module won't be re-run - // during incremental build. - srcs: [ - "src/**/*.java", - ], - cmd: "echo \"git.version=`cd frameworks/multidex/library; git log --format=\"%H\" -n 1 || " + - "(echo git hash not available; exit 0)`\" > $(genDir)/android-support-multidex.version.txt", - out: [ - "android-support-multidex.version.txt", - ], -} - java_library_static { name: "android-support-multidex", sdk_version: "15", @@ -45,9 +28,6 @@ java_library_static { srcs: [ "src/**/*.java", ], - java_resources: [ - ":android-support-multidex-version", - ], product_variables: { unbundled_build: { // Don't build the library in unbundled branches. |