commit 36f295abe027799dde9e14a6e2c2aad0dfd6db60
author Xin Li <delphij@google.com> Mon Aug 06 16:51:28 2018 -0700
committer Xin Li <delphij@google.com> Mon Aug 06 16:51:28 2018 -0700
tree c9bc875234c5ed1940ea835ed8a48319aa4c05d3
parent 0ed69e07ef9e23ad9a199460ff0cba4b1410d0b2
parent 7f76f6c4d2472243d98ad8cb0e031d41127801ef

Merge Android Pie into master

Bug: 112104996
Change-Id: I437ea1e9fbf8d37d40fa9854e161639da8ec8727

PMC/Android.mk

diff --git a/PMC/Android.mk b/PMC/Android.mk
index d868e1d..875a343 100644
--- a/PMC/Android.mk
+++ b/PMC/Android.mk
@@ -1,9 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v13 jsr305
-
 LOCAL_PACKAGE_NAME := PMC
 LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_CERTIFICATE := platform