Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I93cf24d4,I32e438ef

Browse Source 
* changes:
  Convert host tools to Android.bp
  Rename aapt_defaults to aapt2_defaults
This commit is contained in:
Treehugger Robot
2017-09-10 01:29:21 +00:00
committed by Gerrit Code Review
parent 5a1e85eb71 d3eac266b0
commit 30798ad13a
28 changed files with 466 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -51,6 +51,7 @@ cc_library {
}
subdirs = [
"cmds/*",
"core/jni",
"libs/*",
"media/*",

11
cmds/am/Android.bp Normal file
View File

@@ -0,0 +1,11 @@
// Copyright 2008 The Android Open Source Project
//
cc_library_host_static {
name: "libinstrumentation",
srcs: ["**/*.proto"],
proto: {
type: "full",
export_proto_headers: true,
},
}

11
cmds/am/Android.mk
View File

@@ -16,14 +16,3 @@ LOCAL_SRC_FILES := am
LOCAL_MODULE_CLASS := EXECUTABLES
LOCAL_MODULE_TAGS := optional
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
$(call all-proto-files-under, proto)
LOCAL_MODULE := libinstrumentation
LOCAL_PROTOC_OPTIMIZE_TYPE := full
LOCAL_EXPORT_C_INCLUDE_DIRS := \
$(call intermediates-dir-for,STATIC_LIBRARIES,libinstrumentation,HOST,,,)/proto/$(LOCAL_PATH)/proto
include $(BUILD_HOST_STATIC_LIBRARY)

11
cmds/interrupter/Android.bp Normal file
View File

@@ -0,0 +1,11 @@
cc_library_shared {
name: "interrupter",
host_supported: true,
srcs: ["interrupter.c"],
cflags: [
"-Wall",
"-Werror",
"-Wunused",
"-Wunreachable-code",
],
}

23
cmds/interrupter/Android.mk
View File

@@ -1,23 +0,0 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
interrupter.c
LOCAL_MODULE := interrupter
LOCAL_MODULE_TAGS := eng tests
LOCAL_LDFLAGS := -ldl
LOCAL_CFLAGS := -Wall -Werror -Wunused -Wunreachable-code
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
interrupter.c
LOCAL_MODULE := interrupter
LOCAL_MODULE_TAGS := eng tests
LOCAL_LDFLAGS := -ldl
LOCAL_CFLAGS := -Wall -Werror -Wunused -Wunreachable-code
include $(BUILD_HOST_SHARED_LIBRARY)

1
libs/usb/Android.bp Normal file
View File

@@ -0,0 +1 @@
subdirs = ["tests/*"]

1
libs/usb/tests/AccessoryChat/Android.bp Normal file
View File

@@ -0,0 +1 @@
subdirs = ["accessorychat"]

30
libs/usb/tests/AccessoryChat/accessorychat/Android.bp Normal file
View File

@@ -0,0 +1,30 @@
cc_binary {
name: "accessorychat",
host_supported: true,
srcs: ["accessorychat.c"],
cflags: [
"-Werror",
"-Wno-unused-parameter",
],
target: {
android: {
shared_libs: [
"libusbhost",
"libcutils",
],
},
host: {
static_libs: [
"libusbhost",
"libcutils",
],
cflags: ["-O0"],
},
darwin: {
enabled: false,
},
},
}

35
libs/usb/tests/AccessoryChat/accessorychat/Android.mk
View File

@@ -1,35 +0,0 @@
LOCAL_PATH:= $(call my-dir)
# Build for Linux (desktop) host
ifeq ($(HOST_OS),linux)
include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := accessorychat.c
LOCAL_MODULE := accessorychat
LOCAL_STATIC_LIBRARIES := libusbhost libcutils
LOCAL_LDLIBS += -lpthread
LOCAL_CFLAGS := -g -O0
include $(BUILD_HOST_EXECUTABLE)
endif
# Build for device
include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := accessorychat.c
LOCAL_MODULE := accessorychat
LOCAL_SHARED_LIBRARIES := libusbhost libcutils
include $(BUILD_EXECUTABLE)

28
libs/usb/tests/accessorytest/Android.bp Normal file
View File

@@ -0,0 +1,28 @@
cc_binary_host {
name: "accessorytest",
srcs: [
"accessory.c",
"audio.c",
"hid.c",
"usb.c",
],
static_libs: [
"libusbhost",
"libcutils",
"libtinyalsa",
],
cflags: [
"-O0",
"-Wno-unused-parameter",
"-Werror",
],
target: {
darwin: {
// Build for Linux host only
enabled: false,
},
},
}

25
libs/usb/tests/accessorytest/Android.mk
View File

@@ -1,25 +0,0 @@
LOCAL_PATH:= $(call my-dir)
# Build for Linux host only
ifeq ($(HOST_OS),linux)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := accessory.c \
audio.c \
hid.c \
usb.c
LOCAL_C_INCLUDES += external/tinyalsa/include
LOCAL_MODULE := accessorytest
LOCAL_STATIC_LIBRARIES := libusbhost libcutils libtinyalsa
LOCAL_LDLIBS += -lpthread
LOCAL_CFLAGS := -g -O0
include $(BUILD_HOST_EXECUTABLE)
endif

2
libs/usb/tests/accessorytest/accessory.h
View File

@@ -19,7 +19,7 @@
int init_audio(unsigned int ic, unsigned int id, unsigned int oc, unsigned int od);
void init_hid();
void usb_run(int enable_accessory);
void usb_run(uintptr_t enable_accessory);
struct usb_device* usb_wait_for_device();

2
libs/usb/tests/accessorytest/hid.c
View File

@@ -139,7 +139,7 @@ static void open_hid(const char* name)
fprintf(stderr, "opened /dev/%s\n", name);
pthread_t th;
pthread_create(&th, NULL, hid_thread, (void *)fd);
pthread_create(&th, NULL, hid_thread, (void *)(uintptr_t)fd);
}
static void* inotify_thread(void* arg)

2
libs/usb/tests/accessorytest/usb.c
View File

@@ -219,7 +219,7 @@ struct usb_device* usb_wait_for_device() {
return device;
}
void usb_run(int enable_accessory) {
void usb_run(uintptr_t enable_accessory) {
struct usb_host_context* context = usb_host_init();
usb_host_run(context, usb_device_added, usb_device_removed, NULL, (void *)enable_accessory);

115
tools/aapt/Android.bp Normal file
View File

@@ -0,0 +1,115 @@
//
// Copyright (C) 2014 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.
//
// ==========================================================
// Setup some common variables for the different build
// targets here.
// ==========================================================
cc_defaults {
name: "aapt_defaults",
static_libs: [
"libandroidfw",
"libpng",
"libutils",
"liblog",
"libcutils",
"libexpat",
"libziparchive",
"libbase",
"libz",
],
group_static_libs: true,
cflags: [
"-Wall",
"-Werror",
],
target: {
windows: {
enabled: true,
},
},
// This tool is prebuilt if we're doing an app-only build.
product_variables: {
pdk: {
enabled: false,
},
unbundled_build: {
enabled: false,
},
},
}
// ==========================================================
// Build the host static library: libaapt
// ==========================================================
cc_library_host_static {
name: "libaapt",
defaults: ["aapt_defaults"],
target: {
darwin: {
cflags: ["-D_DARWIN_UNLIMITED_STREAMS"],
},
},
cflags: [
"-Wno-format-y2k",
"-DSTATIC_ANDROIDFW_FOR_TOOLS",
],
srcs: [
"AaptAssets.cpp",
"AaptConfig.cpp",
"AaptUtil.cpp",
"AaptXml.cpp",
"ApkBuilder.cpp",
"Command.cpp",
"CrunchCache.cpp",
"FileFinder.cpp",
"Images.cpp",
"Package.cpp",
"pseudolocalize.cpp",
"Resource.cpp",
"ResourceFilter.cpp",
"ResourceIdCache.cpp",
"ResourceTable.cpp",
"SourcePos.cpp",
"StringPool.cpp",
"WorkQueue.cpp",
"XMLNode.cpp",
"ZipEntry.cpp",
"ZipFile.cpp",
],
}
// ==========================================================
// Build the host tests: libaapt_tests
// ==========================================================
cc_test_host {
name: "libaapt_tests",
defaults: ["aapt_defaults"],
srcs: [
"tests/AaptConfig_test.cpp",
"tests/AaptGroupEntry_test.cpp",
"tests/Pseudolocales_test.cpp",
"tests/ResourceFilter_test.cpp",
"tests/ResourceTable_test.cpp",
],
static_libs: ["libaapt"],
}

62
tools/aapt/Android.mk
View File

@@ -14,7 +14,6 @@
# limitations under the License.
#
# This tool is prebuilt if we're doing an app-only build.
ifeq ($(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)),)
# ==========================================================
@@ -23,37 +22,6 @@ ifeq ($(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)),)
# ==========================================================
LOCAL_PATH:= $(call my-dir)
aaptMain := Main.cpp
aaptSources := \
AaptAssets.cpp \
AaptConfig.cpp \
AaptUtil.cpp \
AaptXml.cpp \
ApkBuilder.cpp \
Command.cpp \
CrunchCache.cpp \
FileFinder.cpp \
Images.cpp \
Package.cpp \
pseudolocalize.cpp \
Resource.cpp \
ResourceFilter.cpp \
ResourceIdCache.cpp \
ResourceTable.cpp \
SourcePos.cpp \
StringPool.cpp \
WorkQueue.cpp \
XMLNode.cpp \
ZipEntry.cpp \
ZipFile.cpp
aaptTests := \
tests/AaptConfig_test.cpp \
tests/AaptGroupEntry_test.cpp \
tests/Pseudolocales_test.cpp \
tests/ResourceFilter_test.cpp \
tests/ResourceTable_test.cpp
aaptHostStaticLibs := \
libandroidfw \
libpng \
@@ -67,20 +35,6 @@ aaptHostStaticLibs := \
aaptCFlags := -Wall -Werror
# ==========================================================
# Build the host static library: libaapt
# ==========================================================
include $(CLEAR_VARS)
LOCAL_MODULE := libaapt
LOCAL_MODULE_HOST_OS := darwin linux windows
LOCAL_CFLAGS := -Wno-format-y2k -DSTATIC_ANDROIDFW_FOR_TOOLS $(aaptCFlags)
LOCAL_CFLAGS_darwin := -D_DARWIN_UNLIMITED_STREAMS
LOCAL_SRC_FILES := $(aaptSources)
LOCAL_STATIC_LIBRARIES := $(aaptHostStaticLibs)
include $(BUILD_HOST_STATIC_LIBRARY)
# ==========================================================
# Build the host executable: aapt
# ==========================================================
@@ -89,23 +43,9 @@ include $(CLEAR_VARS)
LOCAL_MODULE := aapt
LOCAL_MODULE_HOST_OS := darwin linux windows
LOCAL_CFLAGS := -DAAPT_VERSION=\"$(BUILD_NUMBER_FROM_FILE)\" $(aaptCFlags)
LOCAL_SRC_FILES := $(aaptMain)
LOCAL_SRC_FILES := Main.cpp
LOCAL_STATIC_LIBRARIES := libaapt $(aaptHostStaticLibs)
include $(BUILD_HOST_EXECUTABLE)
# ==========================================================
# Build the host tests: libaapt_tests
# ==========================================================
include $(CLEAR_VARS)
LOCAL_MODULE := libaapt_tests
LOCAL_CFLAGS := $(aaptCFlags)
LOCAL_SRC_FILES := $(aaptTests)
LOCAL_STATIC_LIBRARIES := libaapt $(aaptHostStaticLibs)
include $(BUILD_HOST_NATIVE_TEST)
endif # No TARGET_BUILD_APPS or TARGET_BUILD_PDK

10
tools/aapt2/Android.bp
View File

@@ -24,7 +24,7 @@ toolSources = [
]
cc_defaults {
name: "aapt_defaults",
name: "aapt2_defaults",
cflags: [
"-Wall",
"-Werror",
@@ -137,7 +137,7 @@ cc_library_host_static {
proto: {
export_proto_headers: true,
},
defaults: ["aapt_defaults"],
defaults: ["aapt2_defaults"],
}
// ==========================================================
@@ -147,7 +147,7 @@ cc_library_host_shared {
name: "libaapt2_jni",
srcs: toolSources + ["jni/aapt2_jni.cpp"],
static_libs: ["libaapt2"],
defaults: ["aapt_defaults"],
defaults: ["aapt2_defaults"],
}
// ==========================================================
@@ -157,7 +157,7 @@ cc_test_host {
name: "aapt2_tests",
srcs: ["test/Common.cpp", "**/*_test.cpp"],
static_libs: ["libaapt2", "libgmock"],
defaults: ["aapt_defaults"],
defaults: ["aapt2_defaults"],
}
// ==========================================================
@@ -167,5 +167,5 @@ cc_binary_host {
name: "aapt2",
srcs: ["Main.cpp"] + toolSources,
static_libs: ["libaapt2"],
defaults: ["aapt_defaults"],
defaults: ["aapt2_defaults"],
}

40
tools/bit/Android.bp Normal file
View File

@@ -0,0 +1,40 @@
//
// Copyright (C) 2015 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.
//
// ==========================================================
// Build the host executable: bit
// ==========================================================
cc_binary_host {
name: "bit",
srcs: [
"aapt.cpp",
"adb.cpp",
"command.cpp",
"main.cpp",
"make.cpp",
"print.cpp",
"util.cpp",
],
static_libs: [
"libexpat",
"libinstrumentation",
"libjsoncpp",
],
shared_libs: ["libprotobuf-cpp-full"],
}

44
tools/bit/Android.mk
View File

@@ -1,44 +0,0 @@
#
# Copyright (C) 2015 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.
#
LOCAL_PATH:= $(call my-dir)
# ==========================================================
# Build the host executable: protoc-gen-javastream
# ==========================================================
include $(CLEAR_VARS)
LOCAL_MODULE := bit
LOCAL_MODULE_HOST_OS := linux darwin
LOCAL_SRC_FILES := \
aapt.cpp \
adb.cpp \
command.cpp \
main.cpp \
make.cpp \
print.cpp \
util.cpp
LOCAL_STATIC_LIBRARIES := \
libexpat \
libinstrumentation \
libjsoncpp
LOCAL_SHARED_LIBRARIES := \
libprotobuf-cpp-full
include $(BUILD_HOST_EXECUTABLE)

2
tools/bit/adb.h
View File

@@ -17,7 +17,7 @@
#ifndef ADB_H
#define ADB_H
#include "instrumentation_data.pb.h"
#include "proto/instrumentation_data.pb.h"
#include <string>

51
tools/obbtool/Android.bp Normal file
View File

@@ -0,0 +1,51 @@
//
// Copyright 2010 The Android Open Source Project
//
// Opaque Binary Blob (OBB) Tool
//
cc_binary_host {
name: "obbtool",
srcs: ["Main.cpp"],
cflags: [
"-Wall",
"-Werror",
"-Wno-mismatched-tags",
],
static_libs: [
"libandroidfw",
"libutils",
"libcutils",
"liblog",
],
// This tool is prebuilt if we're doing an app-only build.
product_variables: {
unbundled_build: {
enabled: false,
},
},
}
//####################################################
cc_binary_host {
name: "pbkdf2gen",
cflags: [
"-Wall",
"-Werror",
"-Wno-mismatched-tags",
],
srcs: ["pbkdf2gen.cpp"],
static_libs: ["libcrypto"],
// This tool is prebuilt if we're doing an app-only build.
product_variables: {
unbundled_build: {
enabled: false,
},
},
}

47
tools/obbtool/Android.mk
View File

@@ -1,47 +0,0 @@
#
# Copyright 2010 The Android Open Source Project
#
# Opaque Binary Blob (OBB) Tool
#
# This tool is prebuilt if we're doing an app-only build.
ifeq ($(TARGET_BUILD_APPS),)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
Main.cpp
LOCAL_CFLAGS := -Wall -Werror -Wno-mismatched-tags
#LOCAL_C_INCLUDES +=
LOCAL_STATIC_LIBRARIES := \
libandroidfw \
libutils \
libcutils \
liblog
ifeq ($(HOST_OS),linux)
LOCAL_LDLIBS += -ldl -lpthread
endif
LOCAL_MODULE := obbtool
include $(BUILD_HOST_EXECUTABLE)
#####################################################
include $(CLEAR_VARS)
LOCAL_MODULE := pbkdf2gen
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := -Wall -Werror -Wno-mismatched-tags
LOCAL_SRC_FILES := pbkdf2gen.cpp
LOCAL_LDLIBS += -ldl
LOCAL_STATIC_LIBRARIES := libcrypto
include $(BUILD_HOST_EXECUTABLE)
#######################################################
endif # TARGET_BUILD_APPS

108
tools/split-select/Android.bp Normal file
View File

@@ -0,0 +1,108 @@
//
// Copyright (C) 2014 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.
//
// ==========================================================
// Setup some common variables for the different build
// targets here.
// ==========================================================
cc_defaults {
name: "split-select_defaults",
cflags: [
"-Wall",
"-Werror",
],
include_dirs: ["frameworks/base/tools"],
static_libs: [
"libaapt",
"libandroidfw",
"libpng",
"libutils",
"liblog",
"libcutils",
"libexpat",
"libziparchive",
"libbase",
"libz",
],
group_static_libs: true,
target: {
windows: {
enabled: true,
},
},
// This tool is prebuilt if we're doing an app-only build.
product_variables: {
pdk: {
enabled: false,
},
unbundled_build: {
enabled: false,
},
},
}
// ==========================================================
// Build the host static library: libsplit-select
// ==========================================================
cc_library_host_static {
name: "libsplit-select",
defaults: ["split-select_defaults"],
srcs: [
"Abi.cpp",
"Grouper.cpp",
"Rule.cpp",
"RuleGenerator.cpp",
"SplitDescription.cpp",
"SplitSelector.cpp",
],
cflags: ["-D_DARWIN_UNLIMITED_STREAMS"],
}
// ==========================================================
// Build the host tests: libsplit-select_tests
// ==========================================================
cc_test_host {
name: "libsplit-select_tests",
defaults: ["split-select_defaults"],
srcs: [
"Grouper_test.cpp",
"Rule_test.cpp",
"RuleGenerator_test.cpp",
"SplitSelector_test.cpp",
"TestRules.cpp",
],
static_libs: ["libsplit-select"],
}
// ==========================================================
// Build the host executable: split-select
// ==========================================================
cc_binary_host {
name: "split-select",
defaults: ["split-select_defaults"],
srcs: ["Main.cpp"],
static_libs: ["libsplit-select"],
}

105
tools/split-select/Android.mk
View File

@@ -1,105 +0,0 @@
#
# Copyright (C) 2014 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.
#
# This tool is prebuilt if we're doing an app-only build.
ifeq ($(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)),)
# ==========================================================
# Setup some common variables for the different build
# targets here.
# ==========================================================
LOCAL_PATH:= $(call my-dir)
main := Main.cpp
sources := \
Abi.cpp \
Grouper.cpp \
Rule.cpp \
RuleGenerator.cpp \
SplitDescription.cpp \
SplitSelector.cpp
testSources := \
Grouper_test.cpp \
Rule_test.cpp \
RuleGenerator_test.cpp \
SplitSelector_test.cpp \
TestRules.cpp
cIncludes := \
frameworks/base/tools
hostStaticLibs := \
libaapt \
libandroidfw \
libpng \
libutils \
liblog \
libcutils \
libexpat \
libziparchive \
libbase \
libz
cFlags := -Wall -Werror
# ==========================================================
# Build the host static library: libsplit-select
# ==========================================================
include $(CLEAR_VARS)
LOCAL_MODULE := libsplit-select
LOCAL_MODULE_HOST_OS := darwin linux windows
LOCAL_SRC_FILES := $(sources)
LOCAL_STATIC_LIBRARIES := $(hostStaticLibs)
LOCAL_C_INCLUDES := $(cIncludes)
LOCAL_CFLAGS := $(cFlags) -D_DARWIN_UNLIMITED_STREAMS
include $(BUILD_HOST_STATIC_LIBRARY)
# ==========================================================
# Build the host tests: libsplit-select_tests
# ==========================================================
include $(CLEAR_VARS)
LOCAL_MODULE := libsplit-select_tests
LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(testSources)
LOCAL_C_INCLUDES := $(cIncludes)
LOCAL_STATIC_LIBRARIES := libsplit-select $(hostStaticLibs)
LOCAL_CFLAGS := $(cFlags)
include $(BUILD_HOST_NATIVE_TEST)
# ==========================================================
# Build the host executable: split-select
# ==========================================================
include $(CLEAR_VARS)
LOCAL_MODULE := split-select
LOCAL_MODULE_HOST_OS := darwin linux windows
LOCAL_SRC_FILES := $(main)
LOCAL_C_INCLUDES := $(cIncludes)
LOCAL_STATIC_LIBRARIES := libsplit-select $(hostStaticLibs)
LOCAL_CFLAGS := $(cFlags)
include $(BUILD_HOST_EXECUTABLE)
endif # No TARGET_BUILD_APPS or TARGET_BUILD_PDK

29
tools/streaming_proto/Android.bp Normal file
View File

@@ -0,0 +1,29 @@
//
// Copyright (C) 2015 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.
//
// ==========================================================
// Build the host executable: protoc-gen-javastream
// ==========================================================
cc_binary_host {
name: "protoc-gen-javastream",
srcs: [
"Errors.cpp",
"string_utils.cpp",
"main.cpp",
],
shared_libs: ["libprotoc"],
}

13
tools/streaming_proto/Android.mk
View File

@@ -15,19 +15,6 @@
#
LOCAL_PATH:= $(call my-dir)
# ==========================================================
# Build the host executable: protoc-gen-javastream
# ==========================================================
include $(CLEAR_VARS)
LOCAL_MODULE := protoc-gen-javastream
LOCAL_SRC_FILES := \
Errors.cpp \
string_utils.cpp \
main.cpp
LOCAL_SHARED_LIBRARIES := \
libprotoc
include $(BUILD_HOST_EXECUTABLE)
# ==========================================================
# Build the java test
# ==========================================================

30
tools/validatekeymaps/Android.bp Normal file
View File

@@ -0,0 +1,30 @@
//
// Copyright 2010 The Android Open Source Project
//
// Keymap validation tool.
//
cc_binary_host {
name: "validatekeymaps",
srcs: ["Main.cpp"],
cflags: [
"-Wall",
"-Werror",
],
static_libs: [
"libinput",
"libutils",
"libcutils",
"liblog",
],
// This tool is prebuilt if we're doing an app-only build.
product_variables: {
unbundled_build: {
enabled: false,
},
},
}

33
tools/validatekeymaps/Android.mk
View File

@@ -1,33 +0,0 @@
#
# Copyright 2010 The Android Open Source Project
#
# Keymap validation tool.
#
# This tool is prebuilt if we're doing an app-only build.
ifeq ($(TARGET_BUILD_APPS),)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
Main.cpp
LOCAL_CFLAGS := -Wall -Werror
LOCAL_STATIC_LIBRARIES := \
libinput \
libutils \
libcutils \
liblog
ifeq ($(HOST_OS),linux)
LOCAL_LDLIBS += -ldl -lpthread
endif
LOCAL_MODULE := validatekeymaps
LOCAL_MODULE_TAGS := optional
include $(BUILD_HOST_EXECUTABLE)
endif # TARGET_BUILD_APPS