drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert SimpleCamera/Android.mk to Android.bp

Browse Source 
1. Converted the SimpleCamera/Android.mk to Android.bp;
2. Converted the tests/Android.mk as well;
3. No renderscript files are found in the srcs.

Bug: 124261647
Test: compared the two apk files built by Make and Soong
Test: m SmartCamera
Test: m SmartCamera-tests
Test: TreeHugger
Change-Id: I324c1c744b5a7f836a32fe8409ab8abf19eeeae9
This commit is contained in:
Yuntao Xu 2022-02-02 16:18:05 -08:00
parent 27c75f17a6
commit 8136d49038
4 changed files with 70 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tests/Camera2Tests/SmartCamera/SimpleCamera/Android.bp Normal file
View File

@ -0,0 +1,34 @@
// Copyright (C) 2013 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.
package {
// See: http://go/android-license-faq
default_applicable_licenses: [
"frameworks_base_license",
],
}
android_test {
name: "SmartCamera",
optimize: {
enabled: false,
},
// comment it out for now since we need use some hidden APIs
sdk_version: "current",
static_libs: ["android-ex-camera2"],
srcs: [
"src/**/*.java",
],
jni_libs: ["libsmartcamera_jni"],
}

45
tests/Camera2Tests/SmartCamera/SimpleCamera/Android.mk
View File

@ -1,45 +0,0 @@
# Copyright (C) 2013 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.
ifneq ($(TARGET_BUILD_JAVA_SUPPORT_LEVEL),)
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests
LOCAL_PROGUARD_ENABLED := disabled
# comment it out for now since we need use some hidden APIs
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := android-ex-camera2
LOCAL_SRC_FILES := \
$(call all-java-files-under, src) \
$(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := SmartCamera
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../NOTICE
LOCAL_JNI_SHARED_LIBRARIES := libsmartcamera_jni
include $(BUILD_PACKAGE)
# Include packages in subdirectories
include $(call all-makefiles-under,$(LOCAL_PATH))
endif

36
tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.bp Normal file
View File

@ -0,0 +1,36 @@
// Copyright (C) 2013 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.
//
package {
// See: http://go/android-license-faq
default_applicable_licenses: [
"frameworks_base_license",
],
}
android_test {
name: "SmartCamera-tests",
platform_apis: true,
srcs: ["src/**/*.java"],
libs: ["android.test.base"],
static_libs: [
"guava",
"junit",
],
optimize: {
enabled: false,
},
instrumentation_for: "SmartCamera",
}

38
tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk
View File

@ -1,38 +0,0 @@
# Copyright (C) 2013 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_MODULE_TAGS := tests
# LOCAL_SDK_VERSION := current
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_PACKAGE_NAME := SmartCamera-tests
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../NOTICE
LOCAL_SRC_FILES += $(call all-java-files-under, src)
LOCAL_JAVA_LIBRARIES := android.test.base
LOCAL_STATIC_JAVA_LIBRARIES := guava junit
LOCAL_PROGUARD_ENABLED := disabled
LOCAL_INSTRUMENTATION_FOR := SmartCamera
include $(BUILD_PACKAGE)