From 7ce8df32a75480383ae1d62255cd255290a3fb35 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Fri, 23 Sep 2016 16:43:49 -0700
Subject: [PATCH] Move libjnigraphics to ndk_library.

The headers are already migrated because they're in
frameworks/native/include/android, which was covered when migrating
libandroid.

Test: make native
Bug: http://b/30465923
Change-Id: I610dc6c613f2a408960088a86629073da38682a0
---
 Android.bp                                 |  1 +
 native/graphics/jni/Android.bp             | 20 ++++++++++++++++++++
 native/graphics/jni/libjnigraphics.map.txt |  8 ++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 native/graphics/jni/Android.bp
 create mode 100644 native/graphics/jni/libjnigraphics.map.txt

diff --git a/Android.bp b/Android.bp
index 597f96ad42263..010b2b476e535 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,4 +14,5 @@
 
 subdirs = [
     "native/android",
+    "native/graphics/jni",
 ]
diff --git a/native/graphics/jni/Android.bp b/native/graphics/jni/Android.bp
new file mode 100644
index 0000000000000..e09b0b4443cd9
--- /dev/null
+++ b/native/graphics/jni/Android.bp
@@ -0,0 +1,20 @@
+// Copyright (C) 2016 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.
+
+// The headers module is in frameworks/native/Android.bp.
+ndk_library {
+    name: "libjnigraphics.ndk",
+    symbol_file: "libjnigraphics.map.txt",
+    first_version: "9",
+}
diff --git a/native/graphics/jni/libjnigraphics.map.txt b/native/graphics/jni/libjnigraphics.map.txt
new file mode 100644
index 0000000000000..a601d8af28308
--- /dev/null
+++ b/native/graphics/jni/libjnigraphics.map.txt
@@ -0,0 +1,8 @@
+LIBJNIGRAPHICS {
+  global:
+    AndroidBitmap_getInfo;
+    AndroidBitmap_lockPixels;
+    AndroidBitmap_unlockPixels;
+  local:
+    *;
+};