diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:18:14 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:18:14 +0000 |
commit | b178a46f5649cec176bfded73ab0efe24a13d4d6 (patch) | |
tree | 966b91241107e8a7e3c80c9a7a63c72212112ac9 | |
parent | 25245b54da4ffd53e4ece0c384a89da270e50418 (diff) | |
parent | ac7df209e3ba002eb4fcfc7c8d4b818a0371fca4 (diff) | |
download | pdk-b178a46f5649cec176bfded73ab0efe24a13d4d6.tar.gz |
Snap for 8564071 from ac7df209e3ba002eb4fcfc7c8d4b818a0371fca4 to mainline-tethering-releaseaml_tet_341712060aml_tet_341610020aml_tet_341511010aml_tet_341411060aml_tet_341310230aml_tet_341112070aml_tet_341010040aml_tet_340913030aml_tet_331910040aml_tet_331820050aml_tet_331711040aml_tet_331511160aml_tet_331511000aml_tet_331412030aml_tet_331312080aml_tet_331117000aml_tet_331012080aml_tet_330911010aml_tet_330812150android14-mainline-tethering-releaseandroid13-mainline-tethering-release
Change-Id: I4b79226a097da5d3c50a6fdf3c0c7c8c5964cebd
-rw-r--r-- | apps/HelloPDK/Android.bp | 11 | ||||
-rw-r--r-- | apps/HelloPDK/Android.mk | 37 | ||||
-rw-r--r-- | apps/HelloPDK/jni/Android.bp | 10 | ||||
-rw-r--r-- | apps/HelloPDK/jni/Android.mk | 38 | ||||
-rw-r--r-- | apps/TestingCamera/Android.bp | 58 | ||||
-rw-r--r-- | apps/TestingCamera/Android.mk | 37 | ||||
-rw-r--r-- | apps/TestingCamera2/Android.bp | 31 | ||||
-rw-r--r-- | apps/TestingCamera2/Android.mk | 38 |
8 files changed, 110 insertions, 150 deletions
diff --git a/apps/HelloPDK/Android.bp b/apps/HelloPDK/Android.bp new file mode 100644 index 0000000..3df5e1e --- /dev/null +++ b/apps/HelloPDK/Android.bp @@ -0,0 +1,11 @@ +package { + // See: http://go/android-license-faq + default_applicable_licenses: ["Android-Apache-2.0"], +} + +android_app { + name: "HelloPDK", + srcs: ["src/**/*.java"], + sdk_version: "current", + jni_libs: ["libhellojni_jni"], +} diff --git a/apps/HelloPDK/Android.mk b/apps/HelloPDK/Android.mk deleted file mode 100644 index 1174bd2..0000000 --- a/apps/HelloPDK/Android.mk +++ /dev/null @@ -1,37 +0,0 @@ -# -# Copyright (C) 2012 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. -# - -# enable Java build only if supproted for PDK -ifneq ($(TARGET_BUILD_JAVA_SUPPORT_LEVEL),) - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := $(call all-java-files-under, src) - -LOCAL_PACKAGE_NAME := HelloPDK -LOCAL_SDK_VERSION := current - -LOCAL_JNI_SHARED_LIBRARIES := libhellojni_jni - -include $(BUILD_PACKAGE) - -# Use the following include to make our test apk. -include $(call all-makefiles-under,$(LOCAL_PATH)) - -endif # Java supproted diff --git a/apps/HelloPDK/jni/Android.bp b/apps/HelloPDK/jni/Android.bp new file mode 100644 index 0000000..ae68da4 --- /dev/null +++ b/apps/HelloPDK/jni/Android.bp @@ -0,0 +1,10 @@ +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + +cc_library_shared { + name: "libhellojni_jni", + srcs: ["HelloJniNative.cpp"], + header_libs: ["jni_headers"], + sdk_version: "current", +} diff --git a/apps/HelloPDK/jni/Android.mk b/apps/HelloPDK/jni/Android.mk deleted file mode 100644 index eb0f219..0000000 --- a/apps/HelloPDK/jni/Android.mk +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (C) 2012 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. -# - -# enable jni only if java build is supported, for PDK -ifneq ($(TARGET_BUILD_JAVA_SUPPORT_LEVEL),) - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := libhellojni_jni - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := \ - HelloJniNative.cpp - -LOCAL_CFLAGS := -Wall -Werror - -LOCAL_C_INCLUDES := $(JNI_H_INCLUDE) - -LOCAL_SDK_VERSION := current - -include $(BUILD_SHARED_LIBRARY) - -endif # java supproted diff --git a/apps/TestingCamera/Android.bp b/apps/TestingCamera/Android.bp new file mode 100644 index 0000000..75deb78 --- /dev/null +++ b/apps/TestingCamera/Android.bp @@ -0,0 +1,58 @@ +// Copyright (C) 2012 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: ["Android-Apache-2.0"], +} + +android_app { + name: "TestingCamera", + sdk_version: "current", + min_sdk_version: "23", + srcs: [ + "src/**/*.java", + ":TestingCamera-rscript{TestingCamera.srcjar}", + ], + resource_zips: [ + ":TestingCamera-rscript{TestingCamera.res.zip}", + ], + dex_preopt: { + enabled: false, + }, +} + +genrule { + name: "TestingCamera-rscript", + srcs: [ + "src/**/*.rscript", + ":rs_script_api", + ":rs_clang_headers", + ], + tools: [ + "llvm-rs-cc", + "soong_zip", + ], + out: [ + "TestingCamera.srcjar", + "TestingCamera.res.zip", + ], + cmd: "for f in $(locations src/**/*.rscript); do " + + " $(location llvm-rs-cc) -o $(genDir)/res/raw -p $(genDir)/src " + + " -I $$(dirname $$(echo $(locations :rs_script_api) | awk '{ print $$1 }')) " + + " -I $$(dirname $$(echo $(locations :rs_clang_headers) | awk '{ print $$1 }')) $${f}; " + + "done && " + + "$(location soong_zip) -srcjar -o $(location TestingCamera.srcjar) -C $(genDir)/src -D $(genDir)/src &&" + + "$(location soong_zip) -o $(location TestingCamera.res.zip) -C $(genDir)/res -D $(genDir)/res", +} diff --git a/apps/TestingCamera/Android.mk b/apps/TestingCamera/Android.mk deleted file mode 100644 index 80a51b4..0000000 --- a/apps/TestingCamera/Android.mk +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (C) 2012 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. - -ifeq ($(TARGET_BUILD_JAVA_SUPPORT_LEVEL),platform) - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - - -LOCAL_SDK_VERSION := current -LOCAL_MIN_SDK_VERSION := 19 - -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) \ - $(call all-renderscript-files-under, src) - -LOCAL_DEX_PREOPT := false - -LOCAL_PACKAGE_NAME := TestingCamera - -include $(BUILD_PACKAGE) - -endif diff --git a/apps/TestingCamera2/Android.bp b/apps/TestingCamera2/Android.bp new file mode 100644 index 0000000..f1cc960 --- /dev/null +++ b/apps/TestingCamera2/Android.bp @@ -0,0 +1,31 @@ +// 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: ["Android-Apache-2.0"], +} + +android_app { + name: "TestingCamera2", + sdk_version: "current", + min_sdk_version: "28", + static_libs: ["android-ex-camera2"], + srcs: [ + "src/**/*.java", + ], + dex_preopt: { + enabled: false, + }, +} diff --git a/apps/TestingCamera2/Android.mk b/apps/TestingCamera2/Android.mk deleted file mode 100644 index a9428a4..0000000 --- a/apps/TestingCamera2/Android.mk +++ /dev/null @@ -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. - -ifeq ($(TARGET_BUILD_JAVA_SUPPORT_LEVEL),platform) - -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SDK_VERSION := current -LOCAL_MIN_SDK_VERSION := 19 - -LOCAL_STATIC_JAVA_LIBRARIES := android-ex-camera2 - -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) \ - $(call all-renderscript-files-under, src) - -LOCAL_DEX_PREOPT := false - -LOCAL_PACKAGE_NAME := TestingCamera2 - -include $(BUILD_PACKAGE) - -endif |