diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-08-24 16:37:35 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-24 16:37:35 +0000 |
commit | c31392c62ae0a8eada11f340ac93752a9ca5d25d (patch) | |
tree | 71cb0f88b020aa4e9c64e77d6d617f1789de6a7b | |
parent | ac7fbf2412e987372cf7ca1a2369b6c76acb5a89 (diff) | |
parent | 67008fa749f0e4310f1d77ce96f452678aa4e67f (diff) | |
download | ex-c31392c62ae0a8eada11f340ac93752a9ca5d25d.tar.gz |
Merge "Convert frameworks/ex/camera2 to Android.bp"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release
-rw-r--r-- | camera2/Android.mk | 16 | ||||
-rw-r--r-- | camera2/portability/Android.bp | 20 | ||||
-rw-r--r-- | camera2/portability/Android.mk | 17 | ||||
-rw-r--r-- | camera2/portability/portability.mk | 24 | ||||
-rw-r--r-- | camera2/portability/tests/Android.bp | 28 | ||||
-rw-r--r-- | camera2/portability/tests/Android.mk | 25 | ||||
-rw-r--r-- | camera2/public/Android.bp | 19 | ||||
-rw-r--r-- | camera2/public/Android.mk | 26 | ||||
-rw-r--r-- | camera2/utils/Android.bp | 19 | ||||
-rw-r--r-- | camera2/utils/Android.mk | 17 | ||||
-rw-r--r-- | camera2/utils/tests/Android.bp | 24 | ||||
-rw-r--r-- | camera2/utils/tests/Android.mk | 24 | ||||
-rw-r--r-- | camera2/utils/utils.mk | 23 |
13 files changed, 110 insertions, 172 deletions
diff --git a/camera2/Android.mk b/camera2/Android.mk deleted file mode 100644 index 37195780..00000000 --- a/camera2/Android.mk +++ /dev/null @@ -1,16 +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. - -# Build all subprojects -include $(call all-subdir-makefiles) diff --git a/camera2/portability/Android.bp b/camera2/portability/Android.bp new file mode 100644 index 00000000..fa7bc056 --- /dev/null +++ b/camera2/portability/Android.bp @@ -0,0 +1,20 @@ +// Copyright 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. + +java_library { + name: "android-ex-camera2-portability", + sdk_version: "current", + srcs: ["src/**/*.java"], + static_libs: ["android-ex-camera2-utils"], +} diff --git a/camera2/portability/Android.mk b/camera2/portability/Android.mk deleted file mode 100644 index 95b64482..00000000 --- a/camera2/portability/Android.mk +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 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. - -LOCAL_PATH := $(call my-dir) -include $(LOCAL_PATH)/portability.mk \ - $(call all-subdir-makefiles) diff --git a/camera2/portability/portability.mk b/camera2/portability/portability.mk deleted file mode 100644 index 2ecc1dfa..00000000 --- a/camera2/portability/portability.mk +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 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. - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := android-ex-camera2-portability -LOCAL_MODULE_TAGS := optional -LOCAL_SDK_VERSION := current -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_STATIC_JAVA_LIBRARIES := android-ex-camera2-utils - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/camera2/portability/tests/Android.bp b/camera2/portability/tests/Android.bp new file mode 100644 index 00000000..66bebb4b --- /dev/null +++ b/camera2/portability/tests/Android.bp @@ -0,0 +1,28 @@ +// 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. + +android_test { + name: "android-ex-camera2-portability-tests", + sdk_version: "current", + srcs: [ + "src/**/*.java", + ], + static_libs: [ + "android-ex-camera2-portability", + "android-ex-camera2-utils", + "android-ex-camera2-utils-tests", + "android-support-test", + "mockito-target-minus-junit4", + ], +} diff --git a/camera2/portability/tests/Android.mk b/camera2/portability/tests/Android.mk deleted file mode 100644 index 23f39e64..00000000 --- a/camera2/portability/tests/Android.mk +++ /dev/null @@ -1,25 +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. - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_PACKAGE_NAME := android-ex-camera2-portability-tests -LOCAL_MODULE_TAGS := tests -LOCAL_SDK_VERSION := current -LOCAL_SRC_FILES := $(call all-java-files-under,src) $(call all-java-files-under,../../utils/tests) -LOCAL_STATIC_JAVA_LIBRARIES := android-ex-camera2-portability android-ex-camera2-utils \ - android-support-test mockito-target-minus-junit4 - -include $(BUILD_PACKAGE) diff --git a/camera2/public/Android.bp b/camera2/public/Android.bp new file mode 100644 index 00000000..80d723b2 --- /dev/null +++ b/camera2/public/Android.bp @@ -0,0 +1,19 @@ +// 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. + +java_library { + name: "android-ex-camera2", + sdk_version: "current", + srcs: ["src/**/*.java"], +} diff --git a/camera2/public/Android.mk b/camera2/public/Android.mk deleted file mode 100644 index a0d14891..00000000 --- a/camera2/public/Android.mk +++ /dev/null @@ -1,26 +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. - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := android-ex-camera2 -LOCAL_SDK_VERSION := current - -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/camera2/utils/Android.bp b/camera2/utils/Android.bp new file mode 100644 index 00000000..85ef75c6 --- /dev/null +++ b/camera2/utils/Android.bp @@ -0,0 +1,19 @@ +// Copyright 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. + +java_library { + name: "android-ex-camera2-utils", + sdk_version: "current", + srcs: ["src/**/*.java"], +} diff --git a/camera2/utils/Android.mk b/camera2/utils/Android.mk deleted file mode 100644 index 36595e1a..00000000 --- a/camera2/utils/Android.mk +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 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. - -LOCAL_PATH := $(call my-dir) -include $(LOCAL_PATH)/utils.mk \ - $(call all-subdir-makefiles) diff --git a/camera2/utils/tests/Android.bp b/camera2/utils/tests/Android.bp new file mode 100644 index 00000000..ab727818 --- /dev/null +++ b/camera2/utils/tests/Android.bp @@ -0,0 +1,24 @@ +// 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. + +android_test { + name: "android-ex-camera2-utils-tests", + sdk_version: "current", + srcs: ["src/**/*.java"], + static_libs: [ + "android-ex-camera2-utils", + "android-support-test", + "mockito-target-minus-junit4", + ], +} diff --git a/camera2/utils/tests/Android.mk b/camera2/utils/tests/Android.mk deleted file mode 100644 index 6e81ec36..00000000 --- a/camera2/utils/tests/Android.mk +++ /dev/null @@ -1,24 +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. - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_PACKAGE_NAME := android-ex-camera2-utils-tests -LOCAL_MODULE_TAGS := tests -LOCAL_SDK_VERSION := current -LOCAL_SRC_FILES := $(call all-java-files-under,src) -LOCAL_STATIC_JAVA_LIBRARIES := android-ex-camera2-utils android-support-test mockito-target-minus-junit4 - -include $(BUILD_PACKAGE) diff --git a/camera2/utils/utils.mk b/camera2/utils/utils.mk deleted file mode 100644 index a193582c..00000000 --- a/camera2/utils/utils.mk +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 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. - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := android-ex-camera2-utils -LOCAL_MODULE_TAGS := optional -LOCAL_SDK_VERSION := current -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -include $(BUILD_STATIC_JAVA_LIBRARY) |