diff options
| author | 2017-12-13 20:55:23 +0000 | |
|---|---|---|
| committer | 2017-12-13 20:55:23 +0000 | |
| commit | 9933afb1f707b2581f41f95bd3800151e460b06c (patch) | |
| tree | eef2c7ad07fe3ecf34e31c121b9d5c44cfff1d4f | |
| parent | 7129b1ef83c482b5a72437807a28ad36882a99ef (diff) | |
| parent | ff6fcaec0ba0fa66cdabb8ec33db5cd66c9428e1 (diff) | |
Merge "Make services.core the final priorityboosted jar" am: a0c1780d3c am: 93de069ec9
am: ff6fcaec0b
Change-Id: I6ba33f829ed72ee799b4855021ba1f136ea49bd4
| -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 446c2a52be22..a2505a8805e3 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: [ @@ -45,7 +45,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;\" " + @@ -55,3 +55,8 @@ java_genrule { " -i $(in)", out: ["services.core.priorityboosted.jar"], } + +java_library { + name: "services.core", + static_libs: ["services.core.priorityboosted"], +} |