release-request-bd6aa7dd-7b02-4794-942c-14599bf61208-for-git_oc-mr1-release-4193791 snap-temp-L98700000083613807
Change-Id: Ifd069874f2ead37d9c11dd777eed1b693f83172e
diff --git a/Android.bp b/Android.bp
index 30a9c59..f2d87a3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -82,9 +82,9 @@
ndk_headers {
name: "ndk_jni.h",
- from: "include/nativehelper",
+ from: "include_jni",
to: "",
- srcs: ["include/nativehelper/jni.h"],
+ srcs: ["include_jni/jni.h"],
license: "NOTICE",
}
diff --git a/include_deprecated/AsynchronousCloseMonitor.h b/include_deprecated/AsynchronousCloseMonitor.h
new file mode 120000
index 0000000..199e36f
--- /dev/null
+++ b/include_deprecated/AsynchronousCloseMonitor.h
@@ -0,0 +1 @@
+../include/nativehelper/AsynchronousCloseMonitor.h
\ No newline at end of file
diff --git a/include_deprecated/JNIHelp.h b/include_deprecated/JNIHelp.h
new file mode 120000
index 0000000..d4cf162
--- /dev/null
+++ b/include_deprecated/JNIHelp.h
@@ -0,0 +1 @@
+../include/nativehelper/JNIHelp.h
\ No newline at end of file
diff --git a/include_deprecated/JniConstants.h b/include_deprecated/JniConstants.h
new file mode 120000
index 0000000..371e61b
--- /dev/null
+++ b/include_deprecated/JniConstants.h
@@ -0,0 +1 @@
+../include/nativehelper/JniConstants.h
\ No newline at end of file
diff --git a/include_deprecated/JniInvocation.h b/include_deprecated/JniInvocation.h
new file mode 120000
index 0000000..7801592
--- /dev/null
+++ b/include_deprecated/JniInvocation.h
@@ -0,0 +1 @@
+../include/nativehelper/JniInvocation.h
\ No newline at end of file
diff --git a/include_deprecated/ScopedBytes.h b/include_deprecated/ScopedBytes.h
new file mode 120000
index 0000000..a084033
--- /dev/null
+++ b/include_deprecated/ScopedBytes.h
@@ -0,0 +1 @@
+../include/nativehelper/ScopedBytes.h
\ No newline at end of file
diff --git a/include_deprecated/ScopedLocalFrame.h b/include_deprecated/ScopedLocalFrame.h
new file mode 120000
index 0000000..17919a0
--- /dev/null
+++ b/include_deprecated/ScopedLocalFrame.h
@@ -0,0 +1 @@
+../include/nativehelper/ScopedLocalFrame.h
\ No newline at end of file
diff --git a/include_deprecated/ScopedLocalRef.h b/include_deprecated/ScopedLocalRef.h
new file mode 120000
index 0000000..73b34e5
--- /dev/null
+++ b/include_deprecated/ScopedLocalRef.h
@@ -0,0 +1 @@
+../include/nativehelper/ScopedLocalRef.h
\ No newline at end of file
diff --git a/include_deprecated/ScopedPrimitiveArray.h b/include_deprecated/ScopedPrimitiveArray.h
new file mode 120000
index 0000000..1105bd3
--- /dev/null
+++ b/include_deprecated/ScopedPrimitiveArray.h
@@ -0,0 +1 @@
+../include/nativehelper/ScopedPrimitiveArray.h
\ No newline at end of file
diff --git a/include_deprecated/ScopedStringChars.h b/include_deprecated/ScopedStringChars.h
new file mode 120000
index 0000000..b23058a
--- /dev/null
+++ b/include_deprecated/ScopedStringChars.h
@@ -0,0 +1 @@
+../include/nativehelper/ScopedStringChars.h
\ No newline at end of file
diff --git a/include_deprecated/ScopedUtfChars.h b/include_deprecated/ScopedUtfChars.h
new file mode 120000
index 0000000..9df1df7
--- /dev/null
+++ b/include_deprecated/ScopedUtfChars.h
@@ -0,0 +1 @@
+../include/nativehelper/ScopedUtfChars.h
\ No newline at end of file
diff --git a/include_deprecated/UniquePtr.h b/include_deprecated/UniquePtr.h
new file mode 120000
index 0000000..e47c2a2
--- /dev/null
+++ b/include_deprecated/UniquePtr.h
@@ -0,0 +1 @@
+../include/nativehelper/UniquePtr.h
\ No newline at end of file
diff --git a/include_deprecated/jni.h b/include_deprecated/jni.h
new file mode 120000
index 0000000..0f70e26
--- /dev/null
+++ b/include_deprecated/jni.h
@@ -0,0 +1 @@
+../include_jni/jni.h
\ No newline at end of file
diff --git a/include_deprecated/toStringArray.h b/include_deprecated/toStringArray.h
new file mode 120000
index 0000000..0875399
--- /dev/null
+++ b/include_deprecated/toStringArray.h
@@ -0,0 +1 @@
+../include/nativehelper/toStringArray.h
\ No newline at end of file
diff --git a/include_jni/jni.h b/include_jni/jni.h
deleted file mode 120000
index 88d1a00..0000000
--- a/include_jni/jni.h
+++ /dev/null
@@ -1 +0,0 @@
-../include/nativehelper/jni.h
\ No newline at end of file
diff --git a/include/nativehelper/jni.h b/include_jni/jni.h
similarity index 100%
rename from include/nativehelper/jni.h
rename to include_jni/jni.h
