From cb1de403ccf26a526a2f5fab97fc6864960fb97c Mon Sep 17 00:00:00 2001 From: Vadim Tryshev Date: Wed, 6 Mar 2019 00:48:44 +0000 Subject: [PATCH] Revert "Add launcher-log-proto-nano rule in Android.bp" This reverts commit 46e1145ecccca78d65f576262971002a78046652. Reason for revert: We decided to get launcher dimensions differently in the short-term Change-Id: I0ff98ed815ca933f53c2318edde96f012ff244e1 --- Android.bp | 41 +++-------------------------------------- 1 file changed, 3 insertions(+), 38 deletions(-) diff --git a/Android.bp b/Android.bp index 5688407c96..c5832441c7 100644 --- a/Android.bp +++ b/Android.bp @@ -13,54 +13,19 @@ // limitations under the License. java_library_static { - name: "launcher-log-proto-nano", - proto: { - type: "nano", - output_params: [ - "store_unknown_fields=true", - "enum_style=java", - ], - local_include_dirs: [ - "protos", - "proto_overrides", - ], - }, - srcs: [ - "protos/**/*.proto", - "proto_overrides/**/*.proto", - ], -} - -android_library{ name: "launcher-aosp-tapl", static_libs: [ "androidx.annotation_annotation", - "androidx.dynamicanimation_dynamicanimation", - "androidx.recyclerview_recyclerview", - "androidx.preference_preference", "androidx.test.runner", "androidx.test.rules", "androidx.test.uiautomator_uiautomator", - "iconloader_base", - "launcher-log-proto-nano", - "launcherprotosnano", "SystemUISharedLib", ], srcs: [ "tests/tapl/**/*.java", - "quickstep/src/**/*.java", - "quickstep/recents_ui_overrides/src/**/*.java", - "src/**/*.java", - "src_build_config/**/*.java", - "src_flags/**/*.java", - "src_plugins/**/*.java", - "src_shortcuts_overrides/**/*.java", - ], - dxflags: ["--multi-dex"], - resource_dirs: [ - "res", - "quickstep/res", - "quickstep/recents_ui_overrides/res", + "quickstep/src/com/android/quickstep/SwipeUpSetting.java", + "src/com/android/launcher3/util/SecureSettingsObserver.java", + "src/com/android/launcher3/TestProtocol.java", ], platform_apis: true, }