diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-22 22:15:20 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-22 23:12:45 +0000 |
| commit | 3354e41c3384945e506c77cf3c887604dc57cf7c (patch) | |
| tree | 1f79fe60a15b51f38e7baa1c772ab4924e466562 | |
| parent | 8b8925ca6ba5b0a405d0a5d0c1d5a5ba46b81c75 (diff) | |
| parent | cb51324568bae548657d5dbee654df0df24d2982 (diff) | |
| download | build-3354e41c3384945e506c77cf3c887604dc57cf7c.tar.gz | |
Make change and version bump to aml_mpr_331515000 for mainline module file: None
Snap for 9516438 from cb51324568bae548657d5dbee654df0df24d2982 to mainline-mediaprovider-release
Change-Id: I5b3a09fabe65005d05ad14efbcc76f98e067fcd6
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/tasks/sts-lite.mk | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index a9454d3fa5..c4336a0bc2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=331514000 +BUILD_ID=331515000 diff --git a/core/tasks/sts-lite.mk b/core/tasks/sts-lite.mk index dee25d4802..65c65c3dc6 100644 --- a/core/tasks/sts-lite.mk +++ b/core/tasks/sts-lite.mk @@ -29,7 +29,8 @@ $(sts_sdk_zip): $(MERGE_ZIPS) $(ZIP2ZIP) $(compatibility_zip) $(sts_sdk_samples) $(ZIP2ZIP) -i $(STS_LITE_ZIP) -o $(STS_LITE_ZIP)_filtered \ -x android-sts-lite/tools/sts-tradefed-tests.jar \ 'android-sts-lite/tools/*:sts-test/libs/' \ - 'android-sts-lite/testcases/*:sts-test/utils/' + 'android-sts-lite/testcases/*:sts-test/utils/' \ + 'android-sts-lite/jdk/**/*:sts-test/jdk/' $(MERGE_ZIPS) $@ $(STS_LITE_ZIP)_filtered $(STS_SDK_SAMPLES) rm -f $(STS_LITE_ZIP)_filtered |