tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Convert libnativebridge[23]?-dummy to soong."

Browse source 
am: 84606f8686

Change-Id: I2c470447f199b2ae0221d310c9283cfd213747cc
This commit is contained in:
Tomasz Wasilczyk 2017-05-09 00:01:30 +00:00 committed by android-build-merger
commit 15bdbbc5fc
4 changed files with 55 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnativebridge/Android.bp
View file

@ -22,3 +22,5 @@ cc_library {
},
},
}
subdirs = ["tests"]

53
libnativebridge/tests/Android.bp Normal file
View file

@ -0,0 +1,53 @@
//
// Copyright (C) 2017 The Android Open Source Project
//
// 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.
//
cc_defaults {
name: "libnativebridge-dummy-defaults",
host_supported: true,
cflags: [
"-Wall",
"-Wextra",
"-Werror",
],
cppflags: ["-fvisibility=protected"],
target: {
android: {
shared_libs: ["libdl"],
},
host: {
host_ldlibs: ["-ldl"],
},
},
}
cc_library_shared {
name: "libnativebridge-dummy",
srcs: ["DummyNativeBridge.cpp"],
defaults: ["libnativebridge-dummy-defaults"],
}
cc_library_shared {
name: "libnativebridge2-dummy",
srcs: ["DummyNativeBridge2.cpp"],
defaults: ["libnativebridge-dummy-defaults"],
}
cc_library_shared {
name: "libnativebridge3-dummy",
srcs: ["DummyNativeBridge3.cpp"],
defaults: ["libnativebridge-dummy-defaults"],
}

2
libnativebridge/tests/Android.mk
View file

@ -1,8 +1,6 @@
# Build the unit tests.
LOCAL_PATH := $(call my-dir)
include $(LOCAL_PATH)/Android.nativebridge-dummy.mk
include $(CLEAR_VARS)
# Build the unit tests.

108
libnativebridge/tests/Android.nativebridge-dummy.mk
View file

@ -1,108 +0,0 @@
LOCAL_PATH:= $(call my-dir)
NATIVE_BRIDGE_COMMON_SRC_FILES := \
DummyNativeBridge.cpp
# Shared library for target
# ========================================================
include $(CLEAR_VARS)
LOCAL_MODULE:= libnativebridge-dummy
LOCAL_SRC_FILES:= $(NATIVE_BRIDGE_COMMON_SRC_FILES)
LOCAL_CLANG := true
LOCAL_CFLAGS += -Werror -Wall
LOCAL_CPPFLAGS := -fvisibility=protected
LOCAL_SHARED_LIBRARIES := libdl
LOCAL_MULTILIB := both
include $(BUILD_SHARED_LIBRARY)
# Shared library for host
# ========================================================
include $(CLEAR_VARS)
LOCAL_MODULE:= libnativebridge-dummy
LOCAL_SRC_FILES:= $(NATIVE_BRIDGE_COMMON_SRC_FILES)
LOCAL_CLANG := true
LOCAL_CFLAGS += -Werror -Wall
LOCAL_CPPFLAGS := -fvisibility=protected
LOCAL_LDFLAGS := -ldl
LOCAL_MULTILIB := both
include $(BUILD_HOST_SHARED_LIBRARY)
# v2.
NATIVE_BRIDGE2_COMMON_SRC_FILES := \
DummyNativeBridge2.cpp
# Shared library for target
# ========================================================
include $(CLEAR_VARS)
LOCAL_MODULE:= libnativebridge2-dummy
LOCAL_SRC_FILES:= $(NATIVE_BRIDGE2_COMMON_SRC_FILES)
LOCAL_CLANG := true
LOCAL_CFLAGS += -Werror -Wall
LOCAL_CPPFLAGS := -fvisibility=protected
LOCAL_SHARED_LIBRARIES := libdl
LOCAL_MULTILIB := both
include $(BUILD_SHARED_LIBRARY)
# Shared library for host
# ========================================================
include $(CLEAR_VARS)
LOCAL_MODULE:= libnativebridge2-dummy
LOCAL_SRC_FILES:= $(NATIVE_BRIDGE2_COMMON_SRC_FILES)
LOCAL_CLANG := true
LOCAL_CFLAGS += -Werror -Wall
LOCAL_CPPFLAGS := -fvisibility=protected
LOCAL_LDFLAGS := -ldl
LOCAL_MULTILIB := both
include $(BUILD_HOST_SHARED_LIBRARY)
# v3.
NATIVE_BRIDGE3_COMMON_SRC_FILES := \
DummyNativeBridge3.cpp
# Shared library for target
# ========================================================
include $(CLEAR_VARS)
LOCAL_MODULE:= libnativebridge3-dummy
LOCAL_SRC_FILES:= $(NATIVE_BRIDGE3_COMMON_SRC_FILES)
LOCAL_CLANG := true
LOCAL_CFLAGS += -Werror -Wall
LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected
LOCAL_LDFLAGS := -ldl
LOCAL_MULTILIB := both
include $(BUILD_SHARED_LIBRARY)
# Shared library for host
# ========================================================
include $(CLEAR_VARS)
LOCAL_MODULE:= libnativebridge3-dummy
LOCAL_SRC_FILES:= $(NATIVE_BRIDGE3_COMMON_SRC_FILES)
LOCAL_CLANG := true
LOCAL_CFLAGS += -Werror -Wall
LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected
LOCAL_LDFLAGS := -ldl
LOCAL_MULTILIB := both
include $(BUILD_HOST_SHARED_LIBRARY)