diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/HelloPDK/Android.bp | 11 | ||||
-rw-r--r-- | apps/HelloPDK/Android.mk | 39 | ||||
-rw-r--r-- | apps/HelloPDK/jni/Android.bp | 10 | ||||
-rw-r--r-- | apps/HelloPDK/jni/Android.mk | 40 | ||||
-rw-r--r-- | apps/TestingCamera2/Android.bp | 31 | ||||
-rw-r--r-- | apps/TestingCamera2/Android.mk | 40 |
6 files changed, 52 insertions, 119 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 9efe8ca..0000000 --- a/apps/HelloPDK/Android.mk +++ /dev/null @@ -1,39 +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_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -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 8f8bb3d..0000000 --- a/apps/HelloPDK/jni/Android.mk +++ /dev/null @@ -1,40 +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_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice - -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/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 57f1790..0000000 --- a/apps/TestingCamera2/Android.mk +++ /dev/null @@ -1,40 +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 -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice - -include $(BUILD_PACKAGE) - -endif |