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

Merge "Convert Android.mk file to Android.bp"

Browse Source
This commit is contained in:
Treehugger Robot
2019-03-15 22:49:30 +00:00
committed by Gerrit Code Review
parent 9931252c3f c3d9efbe3a
commit 504a33a64e
20 changed files with 101 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
media/mca/Android.mk
View File

@@ -1,21 +0,0 @@
# Copyright (C) 2011 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 all native libraries
#
include $(call all-subdir-makefiles)

21
media/mca/samples/Android.mk
View File

@@ -1,21 +0,0 @@
# Copyright (C) 2011 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 all native libraries
#
include $(call all-subdir-makefiles)

26
media/mca/samples/CameraEffectsRecordingSample/Android.bp Normal file
View File

@@ -0,0 +1,26 @@
// Copyright (C) 2011 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 activity
android_test {
name: "CameraEffectsRecordingSample",
srcs: ["**/*.java"],
platform_apis: true,
optimize: {
enabled: false,
},
}

35
media/mca/samples/CameraEffectsRecordingSample/Android.mk
View File

@@ -1,35 +0,0 @@
# Copyright (C) 2011 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 activity
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_PACKAGE_NAME := CameraEffectsRecordingSample
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_PROGUARD_ENABLED := disabled
include $(BUILD_PACKAGE)
# ============================================================
# Also build all of the sub-targets under this one: the shared library.
include $(call all-makefiles-under,$(LOCAL_PATH))

12
media/mca/tests/Android.bp Normal file
View File

@@ -0,0 +1,12 @@
android_test {
name: "CameraEffectsTests",
libs: [
"android.test.runner",
"android.test.base",
],
static_libs: ["junit"],
// Include all test java files.
srcs: ["src/**/*.java"],
platform_apis: true,
instrumentation_for: "CameraEffectsRecordingSample",
}

20
media/mca/tests/Android.mk
View File

@@ -1,20 +0,0 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
# We only want this apk build for tests.
LOCAL_MODULE_TAGS := tests
LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base
LOCAL_STATIC_JAVA_LIBRARIES := junit
# Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := CameraEffectsTests
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_INSTRUMENTATION_FOR := CameraEffectsRecordingSample
include $(BUILD_PACKAGE)

6
media/packages/BluetoothMidiService/Android.bp Normal file
View File

@@ -0,0 +1,6 @@
android_app {
name: "BluetoothMidiService",
srcs: ["src/**/*.java"],
platform_apis: true,
certificate: "platform",
}

13
media/packages/BluetoothMidiService/Android.mk
View File

@@ -1,13 +0,0 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES += \
$(call all-java-files-under,src)
LOCAL_PACKAGE_NAME := BluetoothMidiService
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := platform
include $(BUILD_PACKAGE)

5
media/tests/CameraBrowser/Android.bp Normal file
View File

@@ -0,0 +1,5 @@
android_test {
name: "CameraBrowser",
srcs: ["**/*.java"],
sdk_version: "current",
}

12
media/tests/CameraBrowser/Android.mk
View File

@@ -1,12 +0,0 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_PACKAGE_NAME := CameraBrowser
LOCAL_SDK_VERSION := current
include $(BUILD_PACKAGE)

5
media/tests/EffectsTest/Android.bp Normal file
View File

@@ -0,0 +1,5 @@
android_test {
name: "EffectsTest",
srcs: ["**/*.java"],
platform_apis: true,
}

11
media/tests/EffectsTest/Android.mk
View File

@@ -1,11 +0,0 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_PACKAGE_NAME := EffectsTest
LOCAL_PRIVATE_PLATFORM_APIS := true
include $(BUILD_PACKAGE)

6
media/tests/MediaDump/Android.bp Normal file
View File

@@ -0,0 +1,6 @@
android_app {
name: "MediaDump",
// Only compile source java files in this apk.
srcs: ["src/**/*.java"],
sdk_version: "current",
}

16
media/tests/MediaDump/Android.mk
View File

@@ -1,16 +0,0 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
# Only compile source java files in this apk.
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := MediaDump
LOCAL_SDK_VERSION := current
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
include $(call all-makefiles-under,$(LOCAL_PATH))

5
media/tests/ScoAudioTest/Android.bp Normal file
View File

@@ -0,0 +1,5 @@
android_test {
name: "scoaudiotest",
platform_apis: true,
srcs: ["**/*.java"],
}

13
media/tests/ScoAudioTest/Android.mk
View File

@@ -1,13 +0,0 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
#LOCAL_SDK_VERSION := current
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_PACKAGE_NAME := scoaudiotest
include $(BUILD_PACKAGE)

5
media/tests/SoundPoolTest/Android.bp Normal file
View File

@@ -0,0 +1,5 @@
android_test {
name: "SoundPoolTest",
srcs: ["**/*.java"],
platform_apis: true,
}

11
media/tests/SoundPoolTest/Android.mk
View File

@@ -1,11 +0,0 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_PACKAGE_NAME := SoundPoolTest
LOCAL_PRIVATE_PLATFORM_APIS := true
include $(BUILD_PACKAGE)

31
media/tests/players/Android.bp Normal file
View File

@@ -0,0 +1,31 @@
// Copyright (C) 2009 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_test_library {
name: "invoke_mock_media_player",
srcs: ["invoke_mock_media_player.cpp"],
shared_libs: [
"libbinder",
"libmedia",
"libutils",
"liblog",
],
cflags: [
"-Wall",
"-Werror",
"-Wunused",
"-Wunreachable-code",
],
gtest: false,
}

32
media/tests/players/Android.mk
View File

@@ -1,32 +0,0 @@
# Copyright (C) 2009 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)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= invoke_mock_media_player.cpp
LOCAL_SHARED_LIBRARIES:= \
libbinder \
libmedia \
libutils \
liblog
LOCAL_MODULE:= invoke_mock_media_player
LOCAL_MODULE_TAGS := tests
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
include $(BUILD_SHARED_LIBRARY)