summaryrefslogtreecommitdiff
path: root/tests/lldb/jni
diff options
context:
space:
mode:
Diffstat (limited to 'tests/lldb/jni')
-rw-r--r--tests/lldb/jni/Allocations/Android.mk3
-rw-r--r--tests/lldb/jni/Allocations/jniallocations/Android.mk2
-rw-r--r--tests/lldb/jni/BranchingFunCalls/Android.mk3
-rw-r--r--tests/lldb/jni/BranchingFunCalls/jnibranchingfuncalls/Android.mk2
-rw-r--r--tests/lldb/jni/DebugWaitAttach/Android.mk3
-rw-r--r--tests/lldb/jni/DebugWaitAttach/jnidebugwaitattach/Android.mk2
-rw-r--r--tests/lldb/jni/InfiniteLoop/Android.mk3
-rw-r--r--tests/lldb/jni/InfiniteLoop/jniinfiniteloop/Android.mk2
-rw-r--r--tests/lldb/jni/KernelVariables/Android.mk3
-rw-r--r--tests/lldb/jni/KernelVariables/jnikernelvariables/Android.mk2
-rw-r--r--tests/lldb/jni/MultipleRSFiles/Android.mk3
-rw-r--r--tests/lldb/jni/MultipleRSFiles/jnimultiplersfiles/Android.mk2
-rw-r--r--tests/lldb/jni/NoDebugWaitAttach/Android.mk3
-rw-r--r--tests/lldb/jni/NoDebugWaitAttach/jninodebugwaitattach/Android.mk2
-rw-r--r--tests/lldb/jni/common.mk3
15 files changed, 29 insertions, 9 deletions
diff --git a/tests/lldb/jni/Allocations/Android.mk b/tests/lldb/jni/Allocations/Android.mk
index 8b0793b6..67ef2d9a 100644
--- a/tests/lldb/jni/Allocations/Android.mk
+++ b/tests/lldb/jni/Allocations/Android.mk
@@ -7,6 +7,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \
$(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := JNIAllocations
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SDK_VERSION := current
LOCAL_JNI_SHARED_LIBRARIES := libjniallocations
@@ -15,4 +17,3 @@ LOCAL_RENDERSCRIPT_FLAGS := -g -O0 -target-api 0
include $(BUILD_PACKAGE)
include $(LOCAL_PATH)/jniallocations/Android.mk
-
diff --git a/tests/lldb/jni/Allocations/jniallocations/Android.mk b/tests/lldb/jni/Allocations/jniallocations/Android.mk
index e5c28635..e52e1a35 100644
--- a/tests/lldb/jni/Allocations/jniallocations/Android.mk
+++ b/tests/lldb/jni/Allocations/jniallocations/Android.mk
@@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := libjniallocations
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SRC_FILES := jniallocations.cpp allocs.rscript
diff --git a/tests/lldb/jni/BranchingFunCalls/Android.mk b/tests/lldb/jni/BranchingFunCalls/Android.mk
index 5fdcdb31..a5ee3b42 100644
--- a/tests/lldb/jni/BranchingFunCalls/Android.mk
+++ b/tests/lldb/jni/BranchingFunCalls/Android.mk
@@ -7,6 +7,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \
$(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := JNIBranchingFunCalls
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SDK_VERSION := current
LOCAL_JNI_SHARED_LIBRARIES := libjnibranchingfuncalls
@@ -15,4 +17,3 @@ LOCAL_RENDERSCRIPT_FLAGS := -g -O0 -target-api 0
include $(BUILD_PACKAGE)
include $(LOCAL_PATH)/jnibranchingfuncalls/Android.mk
-
diff --git a/tests/lldb/jni/BranchingFunCalls/jnibranchingfuncalls/Android.mk b/tests/lldb/jni/BranchingFunCalls/jnibranchingfuncalls/Android.mk
index 34dd1add..69f9162c 100644
--- a/tests/lldb/jni/BranchingFunCalls/jnibranchingfuncalls/Android.mk
+++ b/tests/lldb/jni/BranchingFunCalls/jnibranchingfuncalls/Android.mk
@@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := libjnibranchingfuncalls
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SRC_FILES := jnibranchingfuncalls.cpp scalars.rscript
diff --git a/tests/lldb/jni/DebugWaitAttach/Android.mk b/tests/lldb/jni/DebugWaitAttach/Android.mk
index 9d848425..14cf20d2 100644
--- a/tests/lldb/jni/DebugWaitAttach/Android.mk
+++ b/tests/lldb/jni/DebugWaitAttach/Android.mk
@@ -7,6 +7,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \
$(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := JNIDebugWaitAttach
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SDK_VERSION := current
LOCAL_JNI_SHARED_LIBRARIES := libjnidebugwaitattach
@@ -15,4 +17,3 @@ LOCAL_RENDERSCRIPT_FLAGS := -g -O0 -target-api 0
include $(BUILD_PACKAGE)
include $(LOCAL_PATH)/jnidebugwaitattach/Android.mk
-
diff --git a/tests/lldb/jni/DebugWaitAttach/jnidebugwaitattach/Android.mk b/tests/lldb/jni/DebugWaitAttach/jnidebugwaitattach/Android.mk
index edb348fc..af7d578a 100644
--- a/tests/lldb/jni/DebugWaitAttach/jnidebugwaitattach/Android.mk
+++ b/tests/lldb/jni/DebugWaitAttach/jnidebugwaitattach/Android.mk
@@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := libjnidebugwaitattach
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SRC_FILES := jnidebugwaitattach.cpp simple.rscript
diff --git a/tests/lldb/jni/InfiniteLoop/Android.mk b/tests/lldb/jni/InfiniteLoop/Android.mk
index 35dfc0d5..892e1e94 100644
--- a/tests/lldb/jni/InfiniteLoop/Android.mk
+++ b/tests/lldb/jni/InfiniteLoop/Android.mk
@@ -7,6 +7,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \
$(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := JNIInfiniteLoop
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SDK_VERSION := current
LOCAL_JNI_SHARED_LIBRARIES := libjniinfiniteloop
@@ -15,4 +17,3 @@ LOCAL_RENDERSCRIPT_FLAGS := -g -O0 -target-api 0
include $(BUILD_PACKAGE)
include $(LOCAL_PATH)/jniinfiniteloop/Android.mk
-
diff --git a/tests/lldb/jni/InfiniteLoop/jniinfiniteloop/Android.mk b/tests/lldb/jni/InfiniteLoop/jniinfiniteloop/Android.mk
index 31001d00..21717224 100644
--- a/tests/lldb/jni/InfiniteLoop/jniinfiniteloop/Android.mk
+++ b/tests/lldb/jni/InfiniteLoop/jniinfiniteloop/Android.mk
@@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := libjniinfiniteloop
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SRC_FILES := jniinfiniteloop.cpp infiniteloop.rscript
diff --git a/tests/lldb/jni/KernelVariables/Android.mk b/tests/lldb/jni/KernelVariables/Android.mk
index 8ab1297d..12017d5a 100644
--- a/tests/lldb/jni/KernelVariables/Android.mk
+++ b/tests/lldb/jni/KernelVariables/Android.mk
@@ -7,6 +7,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \
$(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := JNIKernelVariables
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SDK_VERSION := current
LOCAL_JNI_SHARED_LIBRARIES := libjnikernelvariables
@@ -15,4 +17,3 @@ LOCAL_RENDERSCRIPT_FLAGS := -g -O0 -target-api 0
include $(BUILD_PACKAGE)
include $(LOCAL_PATH)/jnikernelvariables/Android.mk
-
diff --git a/tests/lldb/jni/KernelVariables/jnikernelvariables/Android.mk b/tests/lldb/jni/KernelVariables/jnikernelvariables/Android.mk
index fe372a74..10afc4bf 100644
--- a/tests/lldb/jni/KernelVariables/jnikernelvariables/Android.mk
+++ b/tests/lldb/jni/KernelVariables/jnikernelvariables/Android.mk
@@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := libjnikernelvariables
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SRC_FILES := jnikernelvariables.cpp simple.rscript
diff --git a/tests/lldb/jni/MultipleRSFiles/Android.mk b/tests/lldb/jni/MultipleRSFiles/Android.mk
index 4aa54e3b..ff24154d 100644
--- a/tests/lldb/jni/MultipleRSFiles/Android.mk
+++ b/tests/lldb/jni/MultipleRSFiles/Android.mk
@@ -7,6 +7,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \
$(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := JNIMultipleRSFiles
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SDK_VERSION := current
LOCAL_JNI_SHARED_LIBRARIES := libjnimultiplersfiles
@@ -15,4 +17,3 @@ LOCAL_RENDERSCRIPT_FLAGS := -g -O0 -target-api 0
include $(BUILD_PACKAGE)
include $(LOCAL_PATH)/jnimultiplersfiles/Android.mk
-
diff --git a/tests/lldb/jni/MultipleRSFiles/jnimultiplersfiles/Android.mk b/tests/lldb/jni/MultipleRSFiles/jnimultiplersfiles/Android.mk
index 6fd4b10a..b3c335fa 100644
--- a/tests/lldb/jni/MultipleRSFiles/jnimultiplersfiles/Android.mk
+++ b/tests/lldb/jni/MultipleRSFiles/jnimultiplersfiles/Android.mk
@@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := libjnimultiplersfiles
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SRC_FILES := jnimultiplersfiles.cpp first.rscript second.rscript
diff --git a/tests/lldb/jni/NoDebugWaitAttach/Android.mk b/tests/lldb/jni/NoDebugWaitAttach/Android.mk
index 84d4e28b..887b1996 100644
--- a/tests/lldb/jni/NoDebugWaitAttach/Android.mk
+++ b/tests/lldb/jni/NoDebugWaitAttach/Android.mk
@@ -7,6 +7,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \
$(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := JNINoDebugWaitAttach
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SDK_VERSION := current
LOCAL_JNI_SHARED_LIBRARIES := libjninodebugwaitattach
@@ -15,4 +17,3 @@ LOCAL_RENDERSCRIPT_FLAGS := -O0 -target-api 0
include $(BUILD_PACKAGE)
include $(LOCAL_PATH)/jninodebugwaitattach/Android.mk
-
diff --git a/tests/lldb/jni/NoDebugWaitAttach/jninodebugwaitattach/Android.mk b/tests/lldb/jni/NoDebugWaitAttach/jninodebugwaitattach/Android.mk
index fda6fcf9..19b08075 100644
--- a/tests/lldb/jni/NoDebugWaitAttach/jninodebugwaitattach/Android.mk
+++ b/tests/lldb/jni/NoDebugWaitAttach/jninodebugwaitattach/Android.mk
@@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := libjninodebugwaitattach
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SRC_FILES := jninodebugwaitattach.cpp simple.rscript
diff --git a/tests/lldb/jni/common.mk b/tests/lldb/jni/common.mk
index 269f1d96..74413077 100644
--- a/tests/lldb/jni/common.mk
+++ b/tests/lldb/jni/common.mk
@@ -1,12 +1,11 @@
LOCAL_MODULE_TAGS := tests
-LOCAL_C_INCLUDES += $(JNI_H_INCLUDE)
-
LOCAL_CPP_FEATURES += exceptions
LOCAL_CFLAGS := -Werror -Wall -Wextra -std=c++11
LOCAL_RENDERSCRIPT_FLAGS += -O0 -target-api 0
+LOCAL_HEADER_LIBRARIES := jni_headers
LOCAL_SHARED_LIBRARIES += libdl liblog
LOCAL_STATIC_LIBRARIES += libRScpp_static