summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Ioffe <ioffe@google.com>2019-04-12 17:24:27 +0100
committerJiyong Park <jiyong@google.com>2019-04-17 16:19:24 +0900
commit0fe1fa165d03e0ef30a68eb53d06b7ea31e6fda4 (patch)
tree3152aae712d8666ddb53b4d6b3f3380e2def5c61
parentbab90bedb2ac8d386d229f440935a9f180ea0e5a (diff)
Remove shim apex from apexd required modules dependency
Shim apex is only required for devices that support updating apex (i.e. ro.apex.updatable = true), since it is used in CTS/GTS tests exercising apex-related APIs. Because apex is going to be installed on all devices running Q, and not only the ones supporting apex updates, shim apex can't be a required dependency for apexd. Instead other changes in this topic pre-installs shim apex only on devices that supports apex updates. Test: apexservice_test Test: flashed marlin and checked shim is not pre-installed Bug: 128625955 Bug: 130382247 Merged-In: If1bbfa4ec409707bb5a9ccaa8a597ed88ddf2497 Change-Id: If1bbfa4ec409707bb5a9ccaa8a597ed88ddf2497 (cherry picked from commit 00effbf649dc302c2893c53c5ea15a58b3328e47)
-rw-r--r--apexd/Android.bp3
1 files changed, 0 insertions, 3 deletions
diff --git a/apexd/Android.bp b/apexd/Android.bp
index b22a1ea..6c6f75d 100644
--- a/apexd/Android.bp
+++ b/apexd/Android.bp
@@ -112,9 +112,6 @@ cc_binary {
ldflags: ["-Wl,--rpath,/system/${LIB}/bootstrap"],
},
},
- required: [
- "com.android.apex.cts.shim.v1_prebuilt",
- ],
}
cc_library_static {