Skip to content

Commit

Permalink
Convert services to Android.bp
Browse files Browse the repository at this point in the history
See build/soong/README.md for more information.

Test: m checkbuild
Exempt-From-Owner-Approval: trivial conversion
Change-Id: I417409281c928ea667d937090d2a0d9d72a449a2
  • Loading branch information
colincross committed Dec 8, 2017
1 parent 23627fb commit e0b2ee5
Show file tree
Hide file tree
Showing 34 changed files with 183 additions and 316 deletions.
43 changes: 43 additions & 0 deletions services/Android.bp
Original file line number Diff line number Diff line change
@@ -1,3 +1,46 @@
// merge all required services into one jar
// ============================================================
java_library {
name: "services",

dex_preopt: {
app_image: true,
profile: "art-profile",
},

srcs: [
"java/**/*.java",
],

// The convention is to name each service module 'services.$(module_name)'
static_libs: [
"services.core.priorityboosted",
"services.accessibility",
"services.appwidget",
"services.autofill",
"services.backup",
"services.companion",
"services.coverage",
"services.devicepolicy",
"services.midi",
"services.net",
"services.print",
"services.restrictions",
"services.usage",
"services.usb",
"services.voiceinteraction",
"android.hidl.base-V1.0-java",
],

libs: [
"android.hidl.manager-V1.0-java",
],

// Uncomment to enable output of certain warnings (deprecated, unchecked)
//javacflags: ["-Xlint"],

}

// native library
// =============================================================

Expand Down
67 changes: 0 additions & 67 deletions services/Android.mk

This file was deleted.

5 changes: 5 additions & 0 deletions services/accessibility/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
java_library_static {
name: "services.accessibility",
srcs: ["java/**/*.java"],
libs: ["services.core"],
}
12 changes: 0 additions & 12 deletions services/accessibility/Android.mk

This file was deleted.

5 changes: 5 additions & 0 deletions services/appwidget/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
java_library_static {
name: "services.appwidget",
srcs: ["java/**/*.java"],
libs: ["services.core"],
}
12 changes: 0 additions & 12 deletions services/appwidget/Android.mk

This file was deleted.

5 changes: 5 additions & 0 deletions services/autofill/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
java_library_static {
name: "services.autofill",
srcs: ["java/**/*.java"],
libs: ["services.core"],
}
12 changes: 0 additions & 12 deletions services/autofill/Android.mk

This file was deleted.

5 changes: 5 additions & 0 deletions services/backup/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
java_library_static {
name: "services.backup",
srcs: ["java/**/*.java"],
libs: ["services.core"],
}
12 changes: 0 additions & 12 deletions services/backup/Android.mk

This file was deleted.

5 changes: 5 additions & 0 deletions services/companion/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
java_library_static {
name: "services.companion",
srcs: ["java/**/*.java"],
libs: ["services.core"],
}
12 changes: 0 additions & 12 deletions services/companion/Android.mk

This file was deleted.

57 changes: 57 additions & 0 deletions services/core/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
java_library_static {
name: "services.core",

aidl: {
include_dirs: [
"frameworks/native/aidl/binder",
"system/core/storaged/binder",
"system/netd/server/binder",
"system/vold/binder",
],
},
srcs: [
"java/**/*.java",
":netd_aidl",
":netd_metrics_aidl",
":installd_aidl",
":storaged_aidl",
":vold_aidl",
"java/com/android/server/EventLogTags.logtags",
"java/com/android/server/am/EventLogTags.logtags",
],

libs: [
"services.net",
"android.hardware.light-V2.0-java",
"android.hardware.power-V1.0-java",
"android.hardware.tv.cec-V1.0-java",
"android.hidl.manager-V1.0-java",
],

static_libs: [
"time_zone_distro",
"time_zone_distro_installer",
"android.hardware.health-V1.0-java",
"android.hardware.health-V2.0-java",
"android.hardware.weaver-V1.0-java",
"android.hardware.biometrics.fingerprint-V2.1-java",
"android.hardware.oemlock-V1.0-java",
"android.hardware.tetheroffload.control-V1.0-java",
"android.hardware.vibrator-V1.0-java",
"android.hardware.configstore-V1.0-java",
"android.hardware.contexthub-V1.0-java",
],
}

java_genrule {
name: "services.core.priorityboosted",
srcs: [":services.core"],
tools: ["lockedregioncodeinjection"],
cmd: "$(location lockedregioncodeinjection) " +
" --targets \"Lcom/android/server/am/ActivityManagerService;,Lcom/android/server/wm/WindowHashMap;\" " +
" --pre \"com/android/server/am/ActivityManagerService.boostPriorityForLockedSection,com/android/server/wm/WindowManagerService.boostPriorityForLockedSection\" " +
" --post \"com/android/server/am/ActivityManagerService.resetPriorityAfterLockedSection,com/android/server/wm/WindowManagerService.resetPriorityAfterLockedSection\" " +
" -o $(out) " +
" -i $(in)",
out: ["services.core.priorityboosted.jar"],
}
72 changes: 0 additions & 72 deletions services/core/Android.mk

This file was deleted.

5 changes: 5 additions & 0 deletions services/coverage/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
java_library_static {
name: "services.coverage",
srcs: ["java/**/*.java"],
libs: ["jacocoagent"],
}
12 changes: 0 additions & 12 deletions services/coverage/Android.mk

This file was deleted.

9 changes: 9 additions & 0 deletions services/devicepolicy/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
java_library_static {
name: "services.devicepolicy",
srcs: ["java/**/*.java"],

libs: [
"conscrypt",
"services.core",
],
}
12 changes: 0 additions & 12 deletions services/devicepolicy/Android.mk

This file was deleted.

5 changes: 5 additions & 0 deletions services/midi/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
java_library_static {
name: "services.midi",
srcs: ["java/**/*.java"],
libs: ["services.core"],
}
Loading

0 comments on commit e0b2ee5

Please sign in to comment.