diff options
author | Trevor Radcliffe <tradical@google.com> | 2021-10-15 17:13:26 +0000 |
---|---|---|
committer | Trevor Radcliffe <tradical@google.com> | 2021-10-19 20:53:32 +0000 |
commit | 064db4a5d73c7849db0890e2194170424778bd09 (patch) | |
tree | 7546851887a05858d9790eb8869b5778bf4cd70e | |
parent | dbc297bfb51776ff35a069310f897e81170d2050 (diff) | |
download | pdk-064db4a5d73c7849db0890e2194170424778bd09.tar.gz |
Migrate HelloPDK to Soong
Also migrates dependency
Fixes: 203211370
Test: Compare APKs and do main build
Test: Treehugger
Change-Id: I4f7705b3290e3cf74986472ff85083db7322b949
-rw-r--r-- | apps/HelloPDK/Android.bp | 11 | ||||
-rw-r--r-- | apps/HelloPDK/Android.mk | 39 | ||||
-rw-r--r-- | apps/HelloPDK/jni/Android.bp | 6 | ||||
-rw-r--r-- | apps/HelloPDK/jni/Android.mk | 40 |
4 files changed, 17 insertions, 79 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..94fd782 --- /dev/null +++ b/apps/HelloPDK/jni/Android.bp @@ -0,0 +1,6 @@ +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 |