From 71044fe7e5594f329f19b1a5e7f1ce2da6562082 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 14 Dec 2016 13:29:28 -0800 Subject: [PATCH] Move libandroid_runtime headers into frameworks/base/core/jni Move libandroid_runtime's headers into its source directory, and export them to modules that link against libandroid_runtime. Also fixes one unused-paramter warning that was hidden by the use of -isystem to include frameworks/base/include. Bug: 33630870 Test: m -j native Change-Id: Id6c2561d6c7d82a7ca2d183f11b1d3d3dcb42843 --- core/jni/Android.mk | 5 ++++- .../jni/include}/android_runtime/AndroidRuntime.h | 2 +- {include => core/jni/include}/android_runtime/Log.h | 0 .../include}/android_runtime/android_app_NativeActivity.h | 0 .../android_runtime/android_content_res_Configuration.h | 0 .../android_runtime/android_graphics_SurfaceTexture.h | 0 .../android_hardware_camera2_CameraMetadata.h | 0 .../jni/include}/android_runtime/android_util_AssetManager.h | 0 .../jni/include}/android_runtime/android_view_InputQueue.h | 0 .../jni/include}/android_runtime/android_view_Surface.h | 0 .../include}/android_runtime/android_view_SurfaceSession.h | 0 11 files changed, 5 insertions(+), 2 deletions(-) rename {include => core/jni/include}/android_runtime/AndroidRuntime.h (99%) rename {include => core/jni/include}/android_runtime/Log.h (100%) rename {include => core/jni/include}/android_runtime/android_app_NativeActivity.h (100%) rename {include => core/jni/include}/android_runtime/android_content_res_Configuration.h (100%) rename {include => core/jni/include}/android_runtime/android_graphics_SurfaceTexture.h (100%) rename {include => core/jni/include}/android_runtime/android_hardware_camera2_CameraMetadata.h (100%) rename {include => core/jni/include}/android_runtime/android_util_AssetManager.h (100%) rename {include => core/jni/include}/android_runtime/android_view_InputQueue.h (100%) rename {include => core/jni/include}/android_runtime/android_view_Surface.h (100%) rename {include => core/jni/include}/android_runtime/android_view_SurfaceSession.h (100%) diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 9a596c6dc1051..5fcde8b5bc4e6 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -185,6 +185,7 @@ LOCAL_SRC_FILES:= \ hwbinder/EphemeralStorage.cpp \ LOCAL_C_INCLUDES += \ + $(LOCAL_PATH)/include \ $(JNI_H_INCLUDE) \ $(LOCAL_PATH)/android/graphics \ $(LOCAL_PATH)/../../libs/hwui \ @@ -279,8 +280,10 @@ LOCAL_SHARED_LIBRARIES += \ # in com_google_android_gles_jni_GLImpl.cpp LOCAL_C_INCLUDES += bionic/libc/private +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include + # AndroidRuntime.h depends on nativehelper/jni.h -LOCAL_EXPORT_C_INCLUDE_DIRS := libnativehelper/include +LOCAL_EXPORT_C_INCLUDE_DIRS += libnativehelper/include LOCAL_MODULE:= libandroid_runtime diff --git a/include/android_runtime/AndroidRuntime.h b/core/jni/include/android_runtime/AndroidRuntime.h similarity index 99% rename from include/android_runtime/AndroidRuntime.h rename to core/jni/include/android_runtime/AndroidRuntime.h index ed77d9aead087..c2189d4af86da 100644 --- a/include/android_runtime/AndroidRuntime.h +++ b/core/jni/include/android_runtime/AndroidRuntime.h @@ -98,7 +98,7 @@ public: * Called when the Java application exits to perform additional cleanup actions * before the process is terminated. */ - virtual void onExit(int code) { } + virtual void onExit(int /*code*/) { } /** create a new thread that is visible from Java */ static android_thread_id_t createJavaThread(const char* name, void (*start)(void *), diff --git a/include/android_runtime/Log.h b/core/jni/include/android_runtime/Log.h similarity index 100% rename from include/android_runtime/Log.h rename to core/jni/include/android_runtime/Log.h diff --git a/include/android_runtime/android_app_NativeActivity.h b/core/jni/include/android_runtime/android_app_NativeActivity.h similarity index 100% rename from include/android_runtime/android_app_NativeActivity.h rename to core/jni/include/android_runtime/android_app_NativeActivity.h diff --git a/include/android_runtime/android_content_res_Configuration.h b/core/jni/include/android_runtime/android_content_res_Configuration.h similarity index 100% rename from include/android_runtime/android_content_res_Configuration.h rename to core/jni/include/android_runtime/android_content_res_Configuration.h diff --git a/include/android_runtime/android_graphics_SurfaceTexture.h b/core/jni/include/android_runtime/android_graphics_SurfaceTexture.h similarity index 100% rename from include/android_runtime/android_graphics_SurfaceTexture.h rename to core/jni/include/android_runtime/android_graphics_SurfaceTexture.h diff --git a/include/android_runtime/android_hardware_camera2_CameraMetadata.h b/core/jni/include/android_runtime/android_hardware_camera2_CameraMetadata.h similarity index 100% rename from include/android_runtime/android_hardware_camera2_CameraMetadata.h rename to core/jni/include/android_runtime/android_hardware_camera2_CameraMetadata.h diff --git a/include/android_runtime/android_util_AssetManager.h b/core/jni/include/android_runtime/android_util_AssetManager.h similarity index 100% rename from include/android_runtime/android_util_AssetManager.h rename to core/jni/include/android_runtime/android_util_AssetManager.h diff --git a/include/android_runtime/android_view_InputQueue.h b/core/jni/include/android_runtime/android_view_InputQueue.h similarity index 100% rename from include/android_runtime/android_view_InputQueue.h rename to core/jni/include/android_runtime/android_view_InputQueue.h diff --git a/include/android_runtime/android_view_Surface.h b/core/jni/include/android_runtime/android_view_Surface.h similarity index 100% rename from include/android_runtime/android_view_Surface.h rename to core/jni/include/android_runtime/android_view_Surface.h diff --git a/include/android_runtime/android_view_SurfaceSession.h b/core/jni/include/android_runtime/android_view_SurfaceSession.h similarity index 100% rename from include/android_runtime/android_view_SurfaceSession.h rename to core/jni/include/android_runtime/android_view_SurfaceSession.h