summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-22 00:18:20 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-22 00:18:20 +0000
commit2d577e9b4c67d1afe41f76ac5d96a789774879d1 (patch)
tree9cbe581ae1806697600b9766c6a0b5b82577df02
parent3014a156b84a468e606d45479c584e622b4f1009 (diff)
parente12b2424ffb1c792f4711b28c747c38362795233 (diff)
downloadmultidex-android14-qpr2-release.tar.gz
Change-Id: I3a5c8734de10bf1db5d4082ac1d7a436e302ac0f
-rw-r--r--instrumentation/Android.bp17
-rw-r--r--library/Android.bp20
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.