From 17e5233cdb93b7bfa7498e94ad7c9cc35c8b2177 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 19 Jan 2021 05:23:08 +0000 Subject: [PATCH 1/2] Revert "Build Settings-robo-testutils for use by SettingsGoogleR..." Revert submission 13183140-SettingsGoogle-bp Reason for revert: b/177766209 Reverted Changes: I73bef76ec:Add ArcSettings and SettingsGoogle to the legacy a... I385629c5c:Build Settings-robo-testutils for use by SettingsG... I863e1d658:Convert ArcSettings to Android.bp If095bc39d:Convert SettingsGoogleRoboTests to Android.bp I8d3f32cd4:Convert SettingsGoogle tests to Android.bp I7ddeb985c:Convert SettingsGoogle to Android.bp I3b8223e64:Export elmyra and columbus aidl files for Settings... I3d2f042a9:Export proguard.flags, manifest and sources for us... Change-Id: I2efd60ab1e64370dbd0e277b7e92c177374ceb36 --- tests/robotests/Android.bp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp index a0fc3c2f313..c8c6c3840d1 100644 --- a/tests/robotests/Android.bp +++ b/tests/robotests/Android.bp @@ -88,15 +88,3 @@ android_robolectric_test { "SettingsLib-search", ], } - -java_library { - name: "Settings-robo-testutils", - srcs: ["src/com/android/settings/testutils/**/*.java"], - - libs: [ - "Settings-core", - "Robolectric_all-target", - "mockito-robolectric-prebuilt", - "truth-prebuilt", - ], -} From 3e2426ca799a5b297ce78e03cb709c78a8de2944 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 19 Jan 2021 05:23:08 +0000 Subject: [PATCH 2/2] Revert "Export proguard.flags, manifest and sources for use by S..." Revert submission 13183140-SettingsGoogle-bp Reason for revert: b/177766209 Reverted Changes: I73bef76ec:Add ArcSettings and SettingsGoogle to the legacy a... I385629c5c:Build Settings-robo-testutils for use by SettingsG... I863e1d658:Convert ArcSettings to Android.bp If095bc39d:Convert SettingsGoogleRoboTests to Android.bp I8d3f32cd4:Convert SettingsGoogle tests to Android.bp I7ddeb985c:Convert SettingsGoogle to Android.bp I3b8223e64:Export elmyra and columbus aidl files for Settings... I3d2f042a9:Export proguard.flags, manifest and sources for us... Change-Id: I9da85caeb3a53cf7ac3216c4b34985423b997fd2 --- Android.bp | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/Android.bp b/Android.bp index 7ac1a5dbcf0..5470e708143 100644 --- a/Android.bp +++ b/Android.bp @@ -93,21 +93,3 @@ android_library_import { name: "contextualcards", aars: ["libs/contextualcards.aar"], } - -filegroup { - name: "Settings_proguard_flags", - srcs: ["proguard.flags"], -} - -// The sources for Settings need to be exposed to SettingsGoogle, etc. -// so they can run the com.android.settingslib.search.IndexableProcessor -// over all the sources together. -filegroup { - name: "Settings_srcs", - srcs: ["src/**/*.java"], -} - -filegroup { - name: "Settings_manifest", - srcs: ["AndroidManifest.xml"], -}