3 files changed, 2 insertions, 15 deletions
diff --git a/frameworks/PlatformLibrary/Android.bp b/frameworks/PlatformLibrary/Android.bp
index 7b3ec73..e78470f 100644
--- a/frameworks/PlatformLibrary/Android.bp
+++ b/frameworks/PlatformLibrary/Android.bp
@@ -12,15 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "device_sample_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["device_sample_license"],
-}
-
 javadoc {
     name: "platform_library-docs",
     srcs: [
diff --git a/frameworks/PlatformLibrary/Android.mk b/frameworks/PlatformLibrary/Android.mk
index db4c97c..d4250af 100644
--- a/frameworks/PlatformLibrary/Android.mk
+++ b/frameworks/PlatformLibrary/Android.mk
@@ -33,8 +33,6 @@ LOCAL_MODULE_TAGS := optional
 
 # This is the target being built.
 LOCAL_MODULE:= com.example.android.platform_library
-LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS:= notice
 LOCAL_SDK_VERSION := current
 
 include $(BUILD_JAVA_LIBRARY)
diff --git a/frameworks/PlatformLibrary/jni/Android.mk b/frameworks/PlatformLibrary/jni/Android.mk
index 1513f70..2b91f05 100644
--- a/frameworks/PlatformLibrary/jni/Android.mk
+++ b/frameworks/PlatformLibrary/jni/Android.mk
@@ -24,8 +24,6 @@ LOCAL_MODULE_TAGS := optional
 
 # This is the target being built.
 LOCAL_MODULE:= libplatform_library_jni
-LOCAL_LICENSE_KINDS:= SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS:= notice
 
 # All of the source files that we will compile.
 LOCAL_SRC_FILES:= \
@@ -42,8 +40,8 @@ LOCAL_SHARED_LIBRARIES := \
 LOCAL_STATIC_LIBRARIES :=
 
 # Also need the JNI headers.
-LOCAL_HEADER_LIBRARIES := \
-	jni_headers
+LOCAL_C_INCLUDES += \
+	$(JNI_H_INCLUDE)
 
 LOCAL_CFLAGS += -Wall -Werror