commit 64ed009399672ea533fbe43fe5d031ee10302cb5
author Sungsoo Lim <sungsoo@google.com> Thu Jan 24 04:25:44 2019 +0900
committer Sungsoo Lim <sungsoo@google.com> Thu Jan 24 14:53:27 2019 +0900
tree 2c1d8b6670ff5c6fb70dbf62c9d9472c5c1b468a
parent 4e475438ad509f49c39fa5141d114fe6f7cacccd

Separate updatable-media library

Test: build
Change-Id: If83855f36a7ed8bb7675e43c7c789fc9cc2b6923

Android.bp

diff --git a/Android.bp b/Android.bp
index 5f0528c..68fd98c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,7 +49,7 @@
         "rs/java/**/*.java",
 
         ":framework-javastream-protos",
-        // TODO: Remove this after introduce corresponding srcs under media/java/
+        // TODO: Resolve circular library dependency and remove media1-srcs and mediasession2-srcs
         ":media1-srcs",
         ":mediasession2-srcs",
 
@@ -1266,9 +1266,7 @@
         ":non_openjdk_javadoc_files",
         ":android_icu4j_src_files_for_docs",
         ":conscrypt_public_api_files",
-        ":media1-stubs-srcs",
-        ":mediasession2-stubs-srcs",
-        ":mediaplayer2-srcs",
+        ":media-srcs-without-aidls",
         "test-mock/src/**/*.java",
         "test-runner/src/**/*.java",
     ],
@@ -1330,9 +1328,7 @@
         ":non_openjdk_javadoc_files",
         ":android_icu4j_src_files_for_docs",
         ":conscrypt_public_api_files",
-        ":media1-stubs-srcs",
-        ":mediasession2-stubs-srcs",
-        ":mediaplayer2-srcs",
+        ":media-srcs-without-aidls",
     ],
     srcs_lib: "framework",
     srcs_lib_whitelist_dirs: frameworks_base_subdirs,