libctsjvmtiagent: Android.mk -> Android.bp
Test: build only
Change-Id: I6ac60a9cb4aef4b0a135981a43c40b7a050dd995
diff --git a/hostsidetests/jvmti/base/jni/Android.bp b/hostsidetests/jvmti/base/jni/Android.bp
new file mode 100644
index 0000000..3567373
--- /dev/null
+++ b/hostsidetests/jvmti/base/jni/Android.bp
@@ -0,0 +1,67 @@
+// Copyright (C) 2017 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.
+
+cc_library_shared {
+ name: "libctsjvmtiagent",
+
+ srcs: [
+ "cts_agent.cpp",
+ "tagging.cpp",
+ "tracking.cpp",
+ "redefine.cpp",
+ ],
+
+ header_libs: [
+ "libopenjdkjvmti_headers",
+ ],
+
+ shared_libs: [
+ "liblog",
+ "libdl",
+ "libz",
+ ],
+
+ // The test implementation. We get this provided by ART.
+ // Note: Needs to be "whole" as this exposes JNI functions.
+ whole_static_libs: ["libctstiagent"],
+
+ // Platform libraries that may not be available to apps. Link in statically.
+ static_libs: ["libbase_ndk"],
+
+ strip: {
+ keep_symbols: true,
+ },
+
+ cflags: [
+ "-Wall",
+ "-Wextra",
+ "-Werror",
+ "-Wunreachable-code",
+ "-Wredundant-decls",
+ "-Wshadow",
+ "-Wunused",
+ "-Wimplicit-fallthrough",
+ "-Wfloat-equal",
+ "-Wint-to-void-pointer-cast",
+ "-Wused-but-marked-unused",
+ "-Wdeprecated",
+ "-Wunreachable-code-break",
+ "-Wunreachable-code-return",
+ "-g",
+ "-O0",
+ ],
+
+ sdk_version: "current",
+ stl: "c++_static",
+}
diff --git a/hostsidetests/jvmti/base/jni/Android.mk b/hostsidetests/jvmti/base/jni/Android.mk
deleted file mode 100644
index 8ecf315..0000000
--- a/hostsidetests/jvmti/base/jni/Android.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright (C) 2017 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.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libctsjvmtiagent
-
-# Don't include this package in any configuration by default.
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := cts_agent.cpp
-
-# Tagging.
-LOCAL_SRC_FILES += tagging.cpp
-
-# Tracking.
-LOCAL_SRC_FILES += tracking.cpp
-
-# redefinition.
-LOCAL_SRC_FILES += redefine.cpp
-
-LOCAL_C_INCLUDES := $(JNI_H_INCLUDE)
-LOCAL_HEADER_LIBRARIES := libopenjdkjvmti_headers
-
-LOCAL_SHARED_LIBRARIES := liblog \
- libdl \
- libz
-
-# The test implementation. We get this provided by ART.
-# Note: Needs to be "whole" as this exposes JNI functions.
-LOCAL_WHOLE_STATIC_LIBRARIES := libctstiagent
-
-# Platform libraries that may not be available to apps. Link in statically.
-LOCAL_STATIC_LIBRARIES += libbase_ndk
-
-LOCAL_STRIP_MODULE := keep_symbols
-
-# Turn on all warnings.
-LOCAL_CFLAGS := -fno-rtti \
- -ggdb3 \
- -Wall \
- -Wextra \
- -Werror \
- -Wunreachable-code \
- -Wredundant-decls \
- -Wshadow \
- -Wunused \
- -Wimplicit-fallthrough \
- -Wfloat-equal \
- -Wint-to-void-pointer-cast \
- -Wused-but-marked-unused \
- -Wdeprecated \
- -Wunreachable-code-break \
- -Wunreachable-code-return \
- -g \
- -O0 \
-
-LOCAL_SDK_VERSION := current
-LOCAL_NDK_STL_VARIANT := c++_static
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/hostsidetests/jvmti/base/jni/redefine.cpp b/hostsidetests/jvmti/base/jni/redefine.cpp
index c6e8726..f96108c 100644
--- a/hostsidetests/jvmti/base/jni/redefine.cpp
+++ b/hostsidetests/jvmti/base/jni/redefine.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "jni.h"
+#include <jni.h>
#include <stack>
#include <string>