Convert services/core/jni to Android.bp
See build/soong/README.md for more information.
Test: m checkbuild
Change-Id: I11a9a39d14adc4c202c6a1725e92e52a38ff2585
diff --git a/services/Android.bp b/services/Android.bp
new file mode 100644
index 0000000..84c45fe
--- /dev/null
+++ b/services/Android.bp
@@ -0,0 +1,8 @@
+// native library
+// =============================================================
+
+cc_library_shared {
+ name: "libandroid_servers",
+ defaults: ["libservices.core-libs"],
+ whole_static_libs: ["libservices.core"],
+}
diff --git a/services/Android.mk b/services/Android.mk
index ed2ba1f..81d8181 100644
--- a/services/Android.mk
+++ b/services/Android.mk
@@ -52,23 +52,6 @@
include $(BUILD_JAVA_LIBRARY)
-# native library
-# =============================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES :=
-LOCAL_SHARED_LIBRARIES :=
-
-# include all the jni subdirs to collect their sources
-include $(wildcard $(LOCAL_PATH)/*/jni/Android.mk)
-
-LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES -DGL_GLEXT_PROTOTYPES
-
-LOCAL_MODULE:= libandroid_servers
-
-include $(BUILD_SHARED_LIBRARY)
-
# =============================================================
ifeq (,$(ONE_SHOT_MAKEFILE))
diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp
new file mode 100644
index 0000000..5d76304
--- /dev/null
+++ b/services/core/jni/Android.bp
@@ -0,0 +1,121 @@
+cc_library_static {
+ name: "libservices.core",
+ defaults: ["libservices.core-libs"],
+
+ cflags: [
+ "-Wall",
+ "-Werror",
+ "-Wno-unused-parameter",
+
+ "-DEGL_EGLEXT_PROTOTYPES",
+ "-DGL_GLEXT_PROTOTYPES",
+ ],
+
+ srcs: [
+ "BroadcastRadio/JavaRef.cpp",
+ "BroadcastRadio/NativeCallbackThread.cpp",
+ "BroadcastRadio/BroadcastRadioService.cpp",
+ "BroadcastRadio/Tuner.cpp",
+ "BroadcastRadio/TunerCallback.cpp",
+ "BroadcastRadio/convert.cpp",
+ "BroadcastRadio/regions.cpp",
+ "com_android_server_AlarmManagerService.cpp",
+ "com_android_server_am_BatteryStatsService.cpp",
+ "com_android_server_connectivity_Vpn.cpp",
+ "com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp",
+ "com_android_server_ConsumerIrService.cpp",
+ "com_android_server_HardwarePropertiesManagerService.cpp",
+ "com_android_server_hdmi_HdmiCecController.cpp",
+ "com_android_server_input_InputApplicationHandle.cpp",
+ "com_android_server_input_InputManagerService.cpp",
+ "com_android_server_input_InputWindowHandle.cpp",
+ "com_android_server_lights_LightsService.cpp",
+ "com_android_server_location_GnssLocationProvider.cpp",
+ "com_android_server_locksettings_SyntheticPasswordManager.cpp",
+ "com_android_server_power_PowerManagerService.cpp",
+ "com_android_server_SerialService.cpp",
+ "com_android_server_storage_AppFuseBridge.cpp",
+ "com_android_server_SystemServer.cpp",
+ "com_android_server_tv_TvUinputBridge.cpp",
+ "com_android_server_tv_TvInputHal.cpp",
+ "com_android_server_vr_VrManagerService.cpp",
+ "com_android_server_UsbDeviceManager.cpp",
+ "com_android_server_UsbDescriptorParser.cpp",
+ "com_android_server_UsbMidiDevice.cpp",
+ "com_android_server_UsbHostManager.cpp",
+ "com_android_server_VibratorService.cpp",
+ "com_android_server_PersistentDataBlockService.cpp",
+ "com_android_server_GraphicsStatsService.cpp",
+ "onload.cpp",
+ ],
+
+ include_dirs: [
+ "frameworks/base/libs",
+ "frameworks/native/services",
+ "system/gatekeeper/include",
+ ],
+}
+
+cc_defaults {
+ name: "libservices.core-libs",
+ shared_libs: [
+ "libandroid_runtime",
+ "libandroidfw",
+ "libaudioclient",
+ "libbase",
+ "libappfuse",
+ "libbinder",
+ "libcutils",
+ "libcrypto",
+ "liblog",
+ "libhardware",
+ "libhardware_legacy",
+ "libhidlbase",
+ "libkeystore_binder",
+ "libnativehelper",
+ "libutils",
+ "libui",
+ "libinput",
+ "libinputflinger",
+ "libinputservice",
+ "libschedulerservicehidl",
+ "libsensorservice",
+ "libsensorservicehidl",
+ "libgui",
+ "libusbhost",
+ "libsuspend",
+ "libEGL",
+ "libGLESv2",
+ "libnetutils",
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libutils",
+ "libhwui",
+ "android.hardware.audio.common@2.0",
+ "android.hardware.broadcastradio@1.0",
+ "android.hardware.broadcastradio@1.1",
+ "android.hardware.broadcastradio@1.2",
+ "android.hardware.contexthub@1.0",
+ "android.hardware.gnss@1.0",
+ "android.hardware.gnss@1.1",
+ "android.hardware.ir@1.0",
+ "android.hardware.light@2.0",
+ "android.hardware.power@1.0",
+ "android.hardware.power@1.1",
+ "android.hardware.tetheroffload.config@1.0",
+ "android.hardware.thermal@1.0",
+ "android.hardware.tv.cec@1.0",
+ "android.hardware.tv.input@1.0",
+ "android.hardware.vibrator@1.0",
+ "android.hardware.vibrator@1.1",
+ "android.hardware.vr@1.0",
+ "android.frameworks.schedulerservice@1.0",
+ "android.frameworks.sensorservice@1.0",
+ ],
+
+ static_libs: [
+ "android.hardware.broadcastradio@common-utils-lib",
+ "libscrypt_static",
+ ],
+}
diff --git a/services/core/jni/Android.mk b/services/core/jni/Android.mk
deleted file mode 100644
index 8b9cf4b..0000000
--- a/services/core/jni/Android.mk
+++ /dev/null
@@ -1,114 +0,0 @@
-# This file is included by the top level services directory to collect source
-# files
-LOCAL_REL_DIR := core/jni
-
-LOCAL_CFLAGS += -Wall -Werror -Wno-unused-parameter
-
-LOCAL_SRC_FILES += \
- $(LOCAL_REL_DIR)/BroadcastRadio/JavaRef.cpp \
- $(LOCAL_REL_DIR)/BroadcastRadio/NativeCallbackThread.cpp \
- $(LOCAL_REL_DIR)/BroadcastRadio/BroadcastRadioService.cpp \
- $(LOCAL_REL_DIR)/BroadcastRadio/Tuner.cpp \
- $(LOCAL_REL_DIR)/BroadcastRadio/TunerCallback.cpp \
- $(LOCAL_REL_DIR)/BroadcastRadio/convert.cpp \
- $(LOCAL_REL_DIR)/BroadcastRadio/regions.cpp \
- $(LOCAL_REL_DIR)/com_android_server_AlarmManagerService.cpp \
- $(LOCAL_REL_DIR)/com_android_server_am_BatteryStatsService.cpp \
- $(LOCAL_REL_DIR)/com_android_server_connectivity_Vpn.cpp \
- $(LOCAL_REL_DIR)/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp \
- $(LOCAL_REL_DIR)/com_android_server_ConsumerIrService.cpp \
- $(LOCAL_REL_DIR)/com_android_server_HardwarePropertiesManagerService.cpp \
- $(LOCAL_REL_DIR)/com_android_server_hdmi_HdmiCecController.cpp \
- $(LOCAL_REL_DIR)/com_android_server_input_InputApplicationHandle.cpp \
- $(LOCAL_REL_DIR)/com_android_server_input_InputManagerService.cpp \
- $(LOCAL_REL_DIR)/com_android_server_input_InputWindowHandle.cpp \
- $(LOCAL_REL_DIR)/com_android_server_lights_LightsService.cpp \
- $(LOCAL_REL_DIR)/com_android_server_location_GnssLocationProvider.cpp \
- $(LOCAL_REL_DIR)/com_android_server_locksettings_SyntheticPasswordManager.cpp \
- $(LOCAL_REL_DIR)/com_android_server_power_PowerManagerService.cpp \
- $(LOCAL_REL_DIR)/com_android_server_SerialService.cpp \
- $(LOCAL_REL_DIR)/com_android_server_storage_AppFuseBridge.cpp \
- $(LOCAL_REL_DIR)/com_android_server_SystemServer.cpp \
- $(LOCAL_REL_DIR)/com_android_server_tv_TvUinputBridge.cpp \
- $(LOCAL_REL_DIR)/com_android_server_tv_TvInputHal.cpp \
- $(LOCAL_REL_DIR)/com_android_server_vr_VrManagerService.cpp \
- $(LOCAL_REL_DIR)/com_android_server_UsbDeviceManager.cpp \
- $(LOCAL_REL_DIR)/com_android_server_UsbDescriptorParser.cpp \
- $(LOCAL_REL_DIR)/com_android_server_UsbMidiDevice.cpp \
- $(LOCAL_REL_DIR)/com_android_server_UsbHostManager.cpp \
- $(LOCAL_REL_DIR)/com_android_server_VibratorService.cpp \
- $(LOCAL_REL_DIR)/com_android_server_PersistentDataBlockService.cpp \
- $(LOCAL_REL_DIR)/com_android_server_GraphicsStatsService.cpp \
- $(LOCAL_REL_DIR)/onload.cpp
-
-LOCAL_C_INCLUDES += \
- $(JNI_H_INCLUDE) \
- external/scrypt/lib/crypto \
- frameworks/base/services \
- frameworks/base/libs \
- frameworks/base/core/jni \
- frameworks/native/services \
- system/core/libappfuse/include \
- system/gatekeeper/include \
- system/security/keystore/include \
- $(call include-path-for, libhardware)/hardware \
- $(call include-path-for, libhardware_legacy)/hardware_legacy \
-
-LOCAL_SHARED_LIBRARIES += \
- libandroid_runtime \
- libandroidfw \
- libaudioclient \
- libbase \
- libappfuse \
- libbinder \
- libcutils \
- libcrypto \
- liblog \
- libhardware \
- libhardware_legacy \
- libhidlbase \
- libkeystore_binder \
- libnativehelper \
- libutils \
- libui \
- libinput \
- libinputflinger \
- libinputservice \
- libschedulerservicehidl \
- libsensorservice \
- libsensorservicehidl \
- libgui \
- libusbhost \
- libsuspend \
- libEGL \
- libGLESv2 \
- libnetutils \
- libhidlbase \
- libhidltransport \
- libhwbinder \
- libutils \
- libhwui \
- android.hardware.audio.common@2.0 \
- android.hardware.broadcastradio@1.0 \
- android.hardware.broadcastradio@1.1 \
- android.hardware.broadcastradio@1.2 \
- android.hardware.contexthub@1.0 \
- android.hardware.gnss@1.0 \
- android.hardware.gnss@1.1 \
- android.hardware.ir@1.0 \
- android.hardware.light@2.0 \
- android.hardware.power@1.0 \
- android.hardware.power@1.1 \
- android.hardware.tetheroffload.config@1.0 \
- android.hardware.thermal@1.0 \
- android.hardware.tv.cec@1.0 \
- android.hardware.tv.input@1.0 \
- android.hardware.vibrator@1.0 \
- android.hardware.vibrator@1.1 \
- android.hardware.vr@1.0 \
- android.frameworks.schedulerservice@1.0 \
- android.frameworks.sensorservice@1.0 \
-
-LOCAL_STATIC_LIBRARIES += \
- android.hardware.broadcastradio@common-utils-lib \
- libscrypt_static \