summaryrefslogtreecommitdiff
path: root/tests/Camera2Tests
diff options
context:
space:
mode:
authorSasha Smundak <asmundak@google.com>2019-02-20 16:52:48 -0800
committerSasha Smundak <asmundak@google.com>2019-03-07 16:14:00 -0800
commitb6aca11e8078b4a93da1c09c94b4d0d7ba0befef (patch)
tree5e9ad0c8f23a127ff116cbd4adf1b72d1fe1bbe5 /tests/Camera2Tests
parent10c573ff852309894b383ae9aa13dca0d64f8d3e (diff)
Convert tests/**/Android.mk files to Android.bp
See build/soong/README.md for more information. Note: tests/ImfTest/Android.mk causes conflict as it hasn't been yet ported to internal master. Do it later. Note: the conversion in the following directories has to be done in the internal master first because of the conflicts: * tests/ActivityManagerPerfTests * tests/AppLaunch * tests/AppLaunchWear * tests/BackgroundDexOptServiceIntegrationTests * tests/Camera2Tests/CameraToo * tests/Camera2Tests/SmartCamera/SimpleCamera * tests/Compatibility * tests/Internal * tests/RcsTests * tests/ServiceCrashTest * tests/UsbTests Bug: 122332340 Test: treehugger Change-Id: Ie17590c6a96aee5caa80d38092a3de5c1b6efe8d
Diffstat (limited to 'tests/Camera2Tests')
-rw-r--r--tests/Camera2Tests/Android.mk1
-rw-r--r--tests/Camera2Tests/SmartCamera/Android.mk14
-rw-r--r--tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.bp4
3 files changed, 0 insertions, 19 deletions
diff --git a/tests/Camera2Tests/Android.mk b/tests/Camera2Tests/Android.mk
deleted file mode 100644
index 5053e7d64389..000000000000
--- a/tests/Camera2Tests/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-include $(call all-subdir-makefiles)
diff --git a/tests/Camera2Tests/SmartCamera/Android.mk b/tests/Camera2Tests/SmartCamera/Android.mk
deleted file mode 100644
index 3fa8f54ae030..000000000000
--- a/tests/Camera2Tests/SmartCamera/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 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.
-include $(call all-subdir-makefiles)
diff --git a/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.bp b/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.bp
index 0b16b0ecf0c1..a23ac38785f6 100644
--- a/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.bp
+++ b/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.bp
@@ -15,9 +15,7 @@
cc_test_library {
name: "libsmartcamera_jni",
-
sdk_version: "14",
-
srcs: [
"contrast.cpp",
"brightness.cpp",
@@ -29,13 +27,11 @@ cc_test_library {
"sobeloperator.cpp",
"stats_scorer.cpp",
],
-
cflags: [
"-Wall",
"-Wextra",
"-Werror",
"-Wno-unused-parameter",
],
-
stl: "c++_static",
}