joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

gn2bp: Remove api sources from cronet_aml_java

Browse source 
Test: ./update_results.sh
Change-Id: I2d1df64fe312806fc834d58847ba7f041e202fc3
This commit is contained in:
Motomu Utsumi 2022-12-23 17:19:03 +09:00
commit 1002cd851b
2 changed files with 20 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

96
tools/gn2bp/Android.bp.swp
View file

@ -2731,38 +2731,6 @@ cc_genrule {
"build/android/java/src/org/chromium/build/annotations/MainDex.java",
"build/android/java/src/org/chromium/build/annotations/MockedInTests.java",
"build/android/java/src/org/chromium/build/annotations/UsedByReflection.java",
"components/cronet/android/api/src/org/chromium/net/BidirectionalStream.java",
"components/cronet/android/api/src/org/chromium/net/CallbackException.java",
"components/cronet/android/api/src/org/chromium/net/CronetEngine.java",
"components/cronet/android/api/src/org/chromium/net/CronetException.java",
"components/cronet/android/api/src/org/chromium/net/CronetProvider.java",
"components/cronet/android/api/src/org/chromium/net/ExperimentalBidirectionalStream.java",
"components/cronet/android/api/src/org/chromium/net/ExperimentalCronetEngine.java",
"components/cronet/android/api/src/org/chromium/net/ExperimentalUrlRequest.java",
"components/cronet/android/api/src/org/chromium/net/ICronetEngineBuilder.java",
"components/cronet/android/api/src/org/chromium/net/InlineExecutionProhibitedException.java",
"components/cronet/android/api/src/org/chromium/net/NetworkException.java",
"components/cronet/android/api/src/org/chromium/net/NetworkQualityRttListener.java",
"components/cronet/android/api/src/org/chromium/net/NetworkQualityThroughputListener.java",
"components/cronet/android/api/src/org/chromium/net/QuicException.java",
"components/cronet/android/api/src/org/chromium/net/RequestFinishedInfo.java",
"components/cronet/android/api/src/org/chromium/net/UploadDataProvider.java",
"components/cronet/android/api/src/org/chromium/net/UploadDataProviders.java",
"components/cronet/android/api/src/org/chromium/net/UploadDataSink.java",
"components/cronet/android/api/src/org/chromium/net/UrlRequest.java",
"components/cronet/android/api/src/org/chromium/net/UrlResponseInfo.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/ByteArrayCronetCallback.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/ContentTypeParametersParser.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/CronetRequestCompletionListener.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/CronetResponse.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/ImplicitFlowControlCallback.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/InMemoryTransformCronetCallback.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/JsonCronetCallback.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/RedirectHandler.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/RedirectHandlers.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/StringCronetCallback.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/UploadDataProviders.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/UrlRequestCallbacks.java",
"components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamBuilderImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamNetworkException.java",
"components/cronet/android/java/src/org/chromium/net/impl/CallbackExceptionImpl.java",
@ -3037,38 +3005,6 @@ java_genrule {
"build/android/java/src/org/chromium/build/annotations/MainDex.java",
"build/android/java/src/org/chromium/build/annotations/MockedInTests.java",
"build/android/java/src/org/chromium/build/annotations/UsedByReflection.java",
"components/cronet/android/api/src/org/chromium/net/BidirectionalStream.java",
"components/cronet/android/api/src/org/chromium/net/CallbackException.java",
"components/cronet/android/api/src/org/chromium/net/CronetEngine.java",
"components/cronet/android/api/src/org/chromium/net/CronetException.java",
"components/cronet/android/api/src/org/chromium/net/CronetProvider.java",
"components/cronet/android/api/src/org/chromium/net/ExperimentalBidirectionalStream.java",
"components/cronet/android/api/src/org/chromium/net/ExperimentalCronetEngine.java",
"components/cronet/android/api/src/org/chromium/net/ExperimentalUrlRequest.java",
"components/cronet/android/api/src/org/chromium/net/ICronetEngineBuilder.java",
"components/cronet/android/api/src/org/chromium/net/InlineExecutionProhibitedException.java",
"components/cronet/android/api/src/org/chromium/net/NetworkException.java",
"components/cronet/android/api/src/org/chromium/net/NetworkQualityRttListener.java",
"components/cronet/android/api/src/org/chromium/net/NetworkQualityThroughputListener.java",
"components/cronet/android/api/src/org/chromium/net/QuicException.java",
"components/cronet/android/api/src/org/chromium/net/RequestFinishedInfo.java",
"components/cronet/android/api/src/org/chromium/net/UploadDataProvider.java",
"components/cronet/android/api/src/org/chromium/net/UploadDataProviders.java",
"components/cronet/android/api/src/org/chromium/net/UploadDataSink.java",
"components/cronet/android/api/src/org/chromium/net/UrlRequest.java",
"components/cronet/android/api/src/org/chromium/net/UrlResponseInfo.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/ByteArrayCronetCallback.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/ContentTypeParametersParser.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/CronetRequestCompletionListener.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/CronetResponse.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/ImplicitFlowControlCallback.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/InMemoryTransformCronetCallback.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/JsonCronetCallback.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/RedirectHandler.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/RedirectHandlers.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/StringCronetCallback.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/UploadDataProviders.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/UrlRequestCallbacks.java",
"components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamBuilderImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamNetworkException.java",
"components/cronet/android/java/src/org/chromium/net/impl/CallbackExceptionImpl.java",
@ -4639,38 +4575,6 @@ java_library {
"build/android/java/src/org/chromium/build/annotations/MainDex.java",
"build/android/java/src/org/chromium/build/annotations/MockedInTests.java",
"build/android/java/src/org/chromium/build/annotations/UsedByReflection.java",
"components/cronet/android/api/src/org/chromium/net/BidirectionalStream.java",
"components/cronet/android/api/src/org/chromium/net/CallbackException.java",
"components/cronet/android/api/src/org/chromium/net/CronetEngine.java",
"components/cronet/android/api/src/org/chromium/net/CronetException.java",
"components/cronet/android/api/src/org/chromium/net/CronetProvider.java",
"components/cronet/android/api/src/org/chromium/net/ExperimentalBidirectionalStream.java",
"components/cronet/android/api/src/org/chromium/net/ExperimentalCronetEngine.java",
"components/cronet/android/api/src/org/chromium/net/ExperimentalUrlRequest.java",
"components/cronet/android/api/src/org/chromium/net/ICronetEngineBuilder.java",
"components/cronet/android/api/src/org/chromium/net/InlineExecutionProhibitedException.java",
"components/cronet/android/api/src/org/chromium/net/NetworkException.java",
"components/cronet/android/api/src/org/chromium/net/NetworkQualityRttListener.java",
"components/cronet/android/api/src/org/chromium/net/NetworkQualityThroughputListener.java",
"components/cronet/android/api/src/org/chromium/net/QuicException.java",
"components/cronet/android/api/src/org/chromium/net/RequestFinishedInfo.java",
"components/cronet/android/api/src/org/chromium/net/UploadDataProvider.java",
"components/cronet/android/api/src/org/chromium/net/UploadDataProviders.java",
"components/cronet/android/api/src/org/chromium/net/UploadDataSink.java",
"components/cronet/android/api/src/org/chromium/net/UrlRequest.java",
"components/cronet/android/api/src/org/chromium/net/UrlResponseInfo.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/ByteArrayCronetCallback.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/ContentTypeParametersParser.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/CronetRequestCompletionListener.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/CronetResponse.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/ImplicitFlowControlCallback.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/InMemoryTransformCronetCallback.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/JsonCronetCallback.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/RedirectHandler.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/RedirectHandlers.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/StringCronetCallback.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/UploadDataProviders.java",
"components/cronet/android/api/src/org/chromium/net/apihelpers/UrlRequestCallbacks.java",
"components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamBuilderImpl.java",
"components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamNetworkException.java",
"components/cronet/android/java/src/org/chromium/net/impl/CallbackExceptionImpl.java",

29
tools/gn2bp/gen_android_bp
View file

@ -213,6 +213,9 @@ experimental_android_deps = {
# Name of tethering apex module
tethering_apex = "com.android.tethering"
# Name of cronet api target
java_api_target_name = "//components/cronet/android:cronet_api_java"
# ----------------------------------------------------------------------------
# End of configuration.
# ----------------------------------------------------------------------------
@ -1476,22 +1479,30 @@ def create_java_jni_preprocessor(blueprint):
blueprint.add_module(module)
return module
def get_java_sources(gn):
def get_java_sources(gn, predicate):
java_sources = set()
for sources in gn.java_sources.values():
java_sources.update(sources)
for target_name, sources in gn.java_sources.items():
if predicate(target_name):
java_sources.update(sources)
return java_sources
def get_java_actions(gn):
def get_java_actions(gn, predicate):
java_actions = set()
for actions in gn.java_actions.values():
java_actions.update(actions)
for target_name, actions in gn.java_actions.items():
if predicate(target_name):
java_actions.update(actions)
return java_actions
def get_non_api_java_sources(gn):
return get_java_sources(gn, lambda name: name != java_api_target_name)
def get_non_api_java_actions(gn):
return get_java_actions(gn, lambda name: name != java_api_target_name)
def create_java_module(blueprint, gn):
bp_module_name = module_prefix + 'java'
module = Module('java_library', bp_module_name, '//gn:java')
module.srcs.update([gn_utils.label_to_path(source) for source in get_java_sources(gn)])
module.srcs.update([gn_utils.label_to_path(source) for source in get_non_api_java_sources(gn)])
module.libs = {
"androidx.annotation_annotation",
"jsr305",
@ -1517,7 +1528,7 @@ def create_java_module(blueprint, gn):
module.javacflags.add("-Aorg.chromium.chrome.skipGenJni")
# TODO: remove following workaround required to make this module visible to make (b/203203405)
module.apex_available.add("//apex_available:platform")
for dep in get_java_actions(gn):
for dep in get_non_api_java_actions(gn):
target = gn.get_target(dep)
if target.script == '//build/android/gyp/gcc_preprocess.py':
module.srcs.add(':' + create_gcc_preprocess_modules(blueprint, target).name)
@ -1530,7 +1541,7 @@ def create_java_module(blueprint, gn):
def update_jni_registration_module(module, gn):
# TODO: java_sources might not contain all the required java files
module.srcs.update([gn_utils.label_to_path(source)
for source in get_java_sources(gn)
for source in get_non_api_java_sources(gn)
if source.endswith('.java')])
def create_blueprint_for_targets(gn, targets):