Switch SL4N over to using Android.bp (3/3)
Due to the move to using mostly header libs for the AVRCP changes SL4N
couldn't find references to certain files without having to include a
large number of include directorys. Swapping the Makefile to Android.bp
makes this much easier to handle.
Bug: 68854188
Test: Compile and see that the application exists where it should
Change-Id: I3cd623bfee4a2cbf95f4bcc212ccd7e9fc980242
(cherry picked from commit 0ed69e07ef9e23ad9a199460ff0cba4b1410d0b2)
Merged-In: I3cd623bfee4a2cbf95f4bcc212ccd7e9fc980242
diff --git a/sl4n/Android.bp b/sl4n/Android.bp
new file mode 100644
index 0000000..64b245b
--- /dev/null
+++ b/sl4n/Android.bp
@@ -0,0 +1,41 @@
+cc_binary {
+ name: "sl4n",
+ header_libs: [
+ "libbluetooth_headers",
+ ],
+ include_dirs: [
+ "system/bt",
+ ],
+ local_include_dirs: [
+ "rapidjson/include",
+ "facades",
+ ],
+ srcs: [
+ "facades/bluetooth/bt_binder_facade.cpp",
+ "facades/test/test_facade.cpp",
+ "main.cpp",
+ "utils/command_receiver.cpp",
+ "utils/common_utils.cpp",
+ ],
+ shared_libs: [
+ "libbinder",
+ "libchrome",
+ "libcutils",
+ "libutils",
+ "libwifi-system",
+ "liblog",
+ ],
+ static_libs: [
+ "libbtcore",
+ "libosi",
+ "libnl",
+ "libbluetooth-binder-common",
+ "libbluetooth-types",
+ ],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ "-Wno-unused-parameter",
+ "-Wno-missing-field-initializers",
+ ],
+}
\ No newline at end of file
diff --git a/sl4n/Android.mk b/sl4n/Android.mk
deleted file mode 100644
index db4649d..0000000
--- a/sl4n/Android.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (C) 2015 Google, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := sl4n
-
-LOCAL_C_INCLUDES += \
- system/bt \
- system/bt/include \
- $(LOCAL_PATH)/rapidjson/include \
- $(LOCAL_PATH)/facades
-
-LOCAL_SRC_FILES := \
- facades/bluetooth/bt_binder_facade.cpp \
- facades/test/test_facade.cpp \
- main.cpp \
- utils/command_receiver.cpp \
- utils/common_utils.cpp
-
-LOCAL_SHARED_LIBRARIES += \
- libbinder \
- libchrome \
- libcutils \
- libutils \
- libwifi-system \
- liblog
-
-LOCAL_STATIC_LIBRARIES += \
- libbtcore \
- libosi \
- libnl \
- libbluetooth-binder-common \
- libbluetooth-types
-
-LOCAL_CFLAGS += -Wall -Werror
-LOCAL_CFLAGS += -Wno-unused-parameter -Wno-missing-field-initializers
-
-include $(BUILD_EXECUTABLE)
