diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-27 07:23:37 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-03-27 07:23:37 +0000 |
commit | f6bfd24d6cdc658ce25f44f3a9c28fed36d07282 (patch) | |
tree | c9bc875234c5ed1940ea835ed8a48319aa4c05d3 | |
parent | 360efd08a79204e9177c0aea2ba19e310302c6df (diff) | |
parent | d30f9f64e9d739fe654163223ed4f012d94f8671 (diff) | |
download | platform_packages_apps_Test_connectivity-security-pi-release.tar.gz platform_packages_apps_Test_connectivity-security-pi-release.tar.bz2 platform_packages_apps_Test_connectivity-security-pi-release.zip |
Snap for 4680594 from d30f9f64e9d739fe654163223ed4f012d94f8671 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r3android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r2android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-release
Change-Id: Iaa5228a1a2acce7794680da2774200a15614791f
-rw-r--r-- | sl4n/Android.bp | 41 | ||||
-rw-r--r-- | sl4n/Android.mk | 55 |
2 files changed, 41 insertions, 55 deletions
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) |