commit ac45ca797dd2465bb83d6351e61b0ddc472820db
author Android Build Role Account android-build-prod <android-build-team-robot@google.com> Sun Sep 29 13:28:43 2019 +0000
committer Android Build Role Account android-build-prod <android-build-team-robot@google.com> Sun Sep 29 13:28:43 2019 +0000
tree a257c2c8d15861206616f78cd708e8ef786fdf98
parent c4ff31115dfdd3e43cc798cdc044e67fed7ed729
parent aaabf1aa8b994b7e1147f530934fc50790217e40

Snap for 5907899 from aaabf1aa8b994b7e1147f530934fc50790217e40 to r-keystone-qcom-release

Change-Id: Ibe82054e4ef89764aa80840e201834dbdec0be8e

Android.bp

diff --git a/Android.bp b/Android.bp
index 2672103..d15b6f3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -20,8 +20,6 @@
 
     srcs: ["caliper/src/main/java/**/*.java"],
     java_resource_dirs: ["caliper/src/main/resources"],
-    // Required for use of javax.annotation.Generated per http://b/62050818
-    javacflags: ["-J--add-modules=java.xml.ws.annotation"],
 
     static_libs: [
         "apache-commons-math",
@@ -69,8 +67,6 @@
 
     srcs: ["caliper/src/test/java/**/*.java"],
     java_resource_dirs: ["caliper/src/test/resources"],
-    // Required for use of javax.annotation.Generated per http://b/62050818
-    javacflags: ["-J--add-modules=java.xml.ws.annotation"],
 
     static_libs: [
         "caliper",

OWNERS

diff --git a/OWNERS b/OWNERS
index 5c6aa31..87a5dbe 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1 @@
-nfuller@google.com
-paulduffin@google.com
+include platform/libcore:/OWNERS