diff options
| author | 2017-12-13 20:43:20 +0000 | |
|---|---|---|
| committer | 2017-12-13 20:43:20 +0000 | |
| commit | ff6fcaec0ba0fa66cdabb8ec33db5cd66c9428e1 (patch) | |
| tree | 3202fb945740238d29c63c7cdb1b51dccb36ab93 | |
| parent | 83a1241e5a86a633b45e4125ada70a0488dbe86a (diff) | |
| parent | 93de069ec9b389aa55ab106c8de264552d7d71bc (diff) | |
Merge "Make services.core the final priorityboosted jar" am: a0c1780d3c
am: 93de069ec9
Change-Id: Ib1a626060f2e2d617ca0b51e016cc7e06cae27d8
| -rw-r--r-- | services/Android.bp | 2 | ||||
| -rw-r--r-- | services/core/Android.bp | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/services/Android.bp b/services/Android.bp index 5e75c371d171..d125adc5fa7d 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -14,7 +14,7 @@ java_library { // The convention is to name each service module 'services.$(module_name)' static_libs: [ - "services.core.priorityboosted", + "services.core", "services.accessibility", "services.appwidget", "services.autofill", diff --git a/services/core/Android.bp b/services/core/Android.bp index 8336b55bd51a..8a761afa418f 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -1,5 +1,5 @@ java_library_static { - name: "services.core", + name: "services.core.unboosted", aidl: { include_dirs: [ @@ -38,7 +38,7 @@ java_library_static { java_genrule { name: "services.core.priorityboosted", - srcs: [":services.core"], + srcs: [":services.core.unboosted"], tools: ["lockedregioncodeinjection"], cmd: "$(location lockedregioncodeinjection) " + " --targets \"Lcom/android/server/am/ActivityManagerService;,Lcom/android/server/wm/WindowHashMap;\" " + @@ -48,3 +48,8 @@ java_genrule { " -i $(in)", out: ["services.core.priorityboosted.jar"], } + +java_library { + name: "services.core", + static_libs: ["services.core.priorityboosted"], +} |