From d8d794977edf3137d968311d7e6432cd312fe9a9 Mon Sep 17 00:00:00 2001 From: Alexander Dorokhine Date: Fri, 16 Oct 2020 22:25:19 -0700 Subject: [PATCH] Remove protos from sdk. Bug: 163453135 Test: AppSearchManagerTest Change-Id: Iafa704dcfd70a6a29565d2c60d36f8006165aed1 --- apex/appsearch/framework/Android.bp | 2 -- apex/appsearch/framework/jarjar-rules.txt | 2 -- core/tests/coretests/Android.bp | 1 - 3 files changed, 5 deletions(-) delete mode 100644 apex/appsearch/framework/jarjar-rules.txt diff --git a/apex/appsearch/framework/Android.bp b/apex/appsearch/framework/Android.bp index e10fb074126f1..12afde4a0f702 100644 --- a/apex/appsearch/framework/Android.bp +++ b/apex/appsearch/framework/Android.bp @@ -26,10 +26,8 @@ java_sdk_library { srcs: [ ":framework-appsearch-sources" ], sdk_version: "core_platform", // TODO(b/146218515) should be module_current impl_only_libs: ["framework-minus-apex"], // TODO(b/146218515) should be removed - static_libs: ["icing-java-proto-lite"], defaults: ["framework-module-defaults"], permitted_packages: ["android.app.appsearch"], - jarjar_rules: "jarjar-rules.txt", aidl: { include_dirs: ["frameworks/base/core/java"], // TODO(b/146218515) should be removed }, diff --git a/apex/appsearch/framework/jarjar-rules.txt b/apex/appsearch/framework/jarjar-rules.txt deleted file mode 100644 index acf759a58d56d..0000000000000 --- a/apex/appsearch/framework/jarjar-rules.txt +++ /dev/null @@ -1,2 +0,0 @@ -rule com.google.protobuf.** android.app.appsearch.protobuf.@1 -rule com.google.android.icing.proto.** android.app.appsearch.proto.@1 diff --git a/core/tests/coretests/Android.bp b/core/tests/coretests/Android.bp index c6ef0948174a7..e2b975ff78ac0 100644 --- a/core/tests/coretests/Android.bp +++ b/core/tests/coretests/Android.bp @@ -54,7 +54,6 @@ android_test { "android.test.mock", "framework-atb-backward-compatibility", "framework", - "icing-java-proto-lite", "ext", "framework-res", ],