Skip to content

Commit aa29def

Browse files
colibiecolibie
committed
Cronet 121.0.6167.71: generate_jni was changed to a group
In https://crrev.com/c/4847468. Hence we need to export transitive deps from groups too. Bug: b/322154153 Change-Id: Ibb349a6436962f0171f855ebe061b320225e225c
1 parent 268983f commit aa29def

File tree

2 files changed

+190
-0
lines changed

2 files changed

+190
-0
lines changed

‎android/tools/gn2bp/Android.bp.swp

Lines changed: 189 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11341,6 +11341,69 @@ java_genrule {
1134111341
// GN: //components/cronet/android:cronet_jni_registration
1134211342
cc_genrule {
1134311343
name: "cronet_aml_components_cronet_android_cronet_jni_registration",
11344+
srcs: [
11345+
"base/android/java/src/org/chromium/base/ApkAssets.java",
11346+
"base/android/java/src/org/chromium/base/ApplicationStatus.java",
11347+
"base/android/java/src/org/chromium/base/BaseFeatureMap.java",
11348+
"base/android/java/src/org/chromium/base/BuildInfo.java",
11349+
"base/android/java/src/org/chromium/base/BundleUtils.java",
11350+
"base/android/java/src/org/chromium/base/Callback.java",
11351+
"base/android/java/src/org/chromium/base/CommandLine.java",
11352+
"base/android/java/src/org/chromium/base/ContentUriUtils.java",
11353+
"base/android/java/src/org/chromium/base/CpuFeatures.java",
11354+
"base/android/java/src/org/chromium/base/EarlyTraceEvent.java",
11355+
"base/android/java/src/org/chromium/base/EventLog.java",
11356+
"base/android/java/src/org/chromium/base/FeatureList.java",
11357+
"base/android/java/src/org/chromium/base/FeatureMap.java",
11358+
"base/android/java/src/org/chromium/base/Features.java",
11359+
"base/android/java/src/org/chromium/base/FieldTrialList.java",
11360+
"base/android/java/src/org/chromium/base/FileUtils.java",
11361+
"base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java",
11362+
"base/android/java/src/org/chromium/base/IntStringCallback.java",
11363+
"base/android/java/src/org/chromium/base/JNIUtils.java",
11364+
"base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
11365+
"base/android/java/src/org/chromium/base/JavaHandlerThread.java",
11366+
"base/android/java/src/org/chromium/base/JniAndroid.java",
11367+
"base/android/java/src/org/chromium/base/LocaleUtils.java",
11368+
"base/android/java/src/org/chromium/base/MemoryPressureListener.java",
11369+
"base/android/java/src/org/chromium/base/PathService.java",
11370+
"base/android/java/src/org/chromium/base/PathUtils.java",
11371+
"base/android/java/src/org/chromium/base/PowerMonitor.java",
11372+
"base/android/java/src/org/chromium/base/RadioUtils.java",
11373+
"base/android/java/src/org/chromium/base/SysUtils.java",
11374+
"base/android/java/src/org/chromium/base/ThreadUtils.java",
11375+
"base/android/java/src/org/chromium/base/TimezoneUtils.java",
11376+
"base/android/java/src/org/chromium/base/TraceEvent.java",
11377+
"base/android/java/src/org/chromium/base/UnguessableToken.java",
11378+
"base/android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java",
11379+
"base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java",
11380+
"base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java",
11381+
"base/android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java",
11382+
"base/android/java/src/org/chromium/base/memory/MemoryInfoBridge.java",
11383+
"base/android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java",
11384+
"base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java",
11385+
"base/android/java/src/org/chromium/base/task/PostTask.java",
11386+
"base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java",
11387+
"components/cronet/android/java/src/org/chromium/net/impl/CronetBidirectionalStream.java",
11388+
"components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java",
11389+
"components/cronet/android/java/src/org/chromium/net/impl/CronetUploadDataStream.java",
11390+
"components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java",
11391+
"components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java",
11392+
"net/android/java/src/org/chromium/net/AndroidCertVerifyResult.java",
11393+
"net/android/java/src/org/chromium/net/AndroidKeyStore.java",
11394+
"net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java",
11395+
"net/android/java/src/org/chromium/net/AndroidTrafficStats.java",
11396+
"net/android/java/src/org/chromium/net/DnsStatus.java",
11397+
"net/android/java/src/org/chromium/net/GURLUtils.java",
11398+
"net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java",
11399+
"net/android/java/src/org/chromium/net/HttpUtil.java",
11400+
"net/android/java/src/org/chromium/net/NetStringUtil.java",
11401+
"net/android/java/src/org/chromium/net/NetworkActiveNotifier.java",
11402+
"net/android/java/src/org/chromium/net/NetworkChangeNotifier.java",
11403+
"net/android/java/src/org/chromium/net/ProxyChangeListener.java",
11404+
"net/android/java/src/org/chromium/net/X509Util.java",
11405+
"url/android/java/src/org/chromium/url/IDNStringUtil.java",
11406+
],
1134411407
cmd: "mkdir -p $(genDir)/components/cronet/android && " +
1134511408
"mkdir -p $(genDir)/jni_headers/components/cronet/android && current_dir=`basename \\`pwd\\``; " +
1134611409
"for f in $(in); " +
@@ -11383,6 +11446,69 @@ cc_genrule {
1138311446
// GN: //components/cronet/android:cronet_jni_registration
1138411447
java_genrule {
1138511448
name: "cronet_aml_components_cronet_android_cronet_jni_registration__java",
11449+
srcs: [
11450+
"base/android/java/src/org/chromium/base/ApkAssets.java",
11451+
"base/android/java/src/org/chromium/base/ApplicationStatus.java",
11452+
"base/android/java/src/org/chromium/base/BaseFeatureMap.java",
11453+
"base/android/java/src/org/chromium/base/BuildInfo.java",
11454+
"base/android/java/src/org/chromium/base/BundleUtils.java",
11455+
"base/android/java/src/org/chromium/base/Callback.java",
11456+
"base/android/java/src/org/chromium/base/CommandLine.java",
11457+
"base/android/java/src/org/chromium/base/ContentUriUtils.java",
11458+
"base/android/java/src/org/chromium/base/CpuFeatures.java",
11459+
"base/android/java/src/org/chromium/base/EarlyTraceEvent.java",
11460+
"base/android/java/src/org/chromium/base/EventLog.java",
11461+
"base/android/java/src/org/chromium/base/FeatureList.java",
11462+
"base/android/java/src/org/chromium/base/FeatureMap.java",
11463+
"base/android/java/src/org/chromium/base/Features.java",
11464+
"base/android/java/src/org/chromium/base/FieldTrialList.java",
11465+
"base/android/java/src/org/chromium/base/FileUtils.java",
11466+
"base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java",
11467+
"base/android/java/src/org/chromium/base/IntStringCallback.java",
11468+
"base/android/java/src/org/chromium/base/JNIUtils.java",
11469+
"base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
11470+
"base/android/java/src/org/chromium/base/JavaHandlerThread.java",
11471+
"base/android/java/src/org/chromium/base/JniAndroid.java",
11472+
"base/android/java/src/org/chromium/base/LocaleUtils.java",
11473+
"base/android/java/src/org/chromium/base/MemoryPressureListener.java",
11474+
"base/android/java/src/org/chromium/base/PathService.java",
11475+
"base/android/java/src/org/chromium/base/PathUtils.java",
11476+
"base/android/java/src/org/chromium/base/PowerMonitor.java",
11477+
"base/android/java/src/org/chromium/base/RadioUtils.java",
11478+
"base/android/java/src/org/chromium/base/SysUtils.java",
11479+
"base/android/java/src/org/chromium/base/ThreadUtils.java",
11480+
"base/android/java/src/org/chromium/base/TimezoneUtils.java",
11481+
"base/android/java/src/org/chromium/base/TraceEvent.java",
11482+
"base/android/java/src/org/chromium/base/UnguessableToken.java",
11483+
"base/android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java",
11484+
"base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java",
11485+
"base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java",
11486+
"base/android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java",
11487+
"base/android/java/src/org/chromium/base/memory/MemoryInfoBridge.java",
11488+
"base/android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java",
11489+
"base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java",
11490+
"base/android/java/src/org/chromium/base/task/PostTask.java",
11491+
"base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java",
11492+
"components/cronet/android/java/src/org/chromium/net/impl/CronetBidirectionalStream.java",
11493+
"components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java",
11494+
"components/cronet/android/java/src/org/chromium/net/impl/CronetUploadDataStream.java",
11495+
"components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java",
11496+
"components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java",
11497+
"net/android/java/src/org/chromium/net/AndroidCertVerifyResult.java",
11498+
"net/android/java/src/org/chromium/net/AndroidKeyStore.java",
11499+
"net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java",
11500+
"net/android/java/src/org/chromium/net/AndroidTrafficStats.java",
11501+
"net/android/java/src/org/chromium/net/DnsStatus.java",
11502+
"net/android/java/src/org/chromium/net/GURLUtils.java",
11503+
"net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java",
11504+
"net/android/java/src/org/chromium/net/HttpUtil.java",
11505+
"net/android/java/src/org/chromium/net/NetStringUtil.java",
11506+
"net/android/java/src/org/chromium/net/NetworkActiveNotifier.java",
11507+
"net/android/java/src/org/chromium/net/NetworkChangeNotifier.java",
11508+
"net/android/java/src/org/chromium/net/ProxyChangeListener.java",
11509+
"net/android/java/src/org/chromium/net/X509Util.java",
11510+
"url/android/java/src/org/chromium/url/IDNStringUtil.java",
11511+
],
1138611512
cmd: "mkdir -p $(genDir)/components/cronet/android && " +
1138711513
"mkdir -p $(genDir)/jni_headers/components/cronet/android && current_dir=`basename \\`pwd\\``; " +
1138811514
"for f in $(in); " +
@@ -11421,6 +11547,69 @@ java_genrule {
1142111547
// GN: //components/cronet/android:cronet_jni_registration__testing
1142211548
cc_genrule {
1142311549
name: "cronet_aml_components_cronet_android_cronet_jni_registration__testing",
11550+
srcs: [
11551+
"base/android/java/src/org/chromium/base/ApkAssets.java",
11552+
"base/android/java/src/org/chromium/base/ApplicationStatus.java",
11553+
"base/android/java/src/org/chromium/base/BaseFeatureMap.java",
11554+
"base/android/java/src/org/chromium/base/BuildInfo.java",
11555+
"base/android/java/src/org/chromium/base/BundleUtils.java",
11556+
"base/android/java/src/org/chromium/base/Callback.java",
11557+
"base/android/java/src/org/chromium/base/CommandLine.java",
11558+
"base/android/java/src/org/chromium/base/ContentUriUtils.java",
11559+
"base/android/java/src/org/chromium/base/CpuFeatures.java",
11560+
"base/android/java/src/org/chromium/base/EarlyTraceEvent.java",
11561+
"base/android/java/src/org/chromium/base/EventLog.java",
11562+
"base/android/java/src/org/chromium/base/FeatureList.java",
11563+
"base/android/java/src/org/chromium/base/FeatureMap.java",
11564+
"base/android/java/src/org/chromium/base/Features.java",
11565+
"base/android/java/src/org/chromium/base/FieldTrialList.java",
11566+
"base/android/java/src/org/chromium/base/FileUtils.java",
11567+
"base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java",
11568+
"base/android/java/src/org/chromium/base/IntStringCallback.java",
11569+
"base/android/java/src/org/chromium/base/JNIUtils.java",
11570+
"base/android/java/src/org/chromium/base/JavaExceptionReporter.java",
11571+
"base/android/java/src/org/chromium/base/JavaHandlerThread.java",
11572+
"base/android/java/src/org/chromium/base/JniAndroid.java",
11573+
"base/android/java/src/org/chromium/base/LocaleUtils.java",
11574+
"base/android/java/src/org/chromium/base/MemoryPressureListener.java",
11575+
"base/android/java/src/org/chromium/base/PathService.java",
11576+
"base/android/java/src/org/chromium/base/PathUtils.java",
11577+
"base/android/java/src/org/chromium/base/PowerMonitor.java",
11578+
"base/android/java/src/org/chromium/base/RadioUtils.java",
11579+
"base/android/java/src/org/chromium/base/SysUtils.java",
11580+
"base/android/java/src/org/chromium/base/ThreadUtils.java",
11581+
"base/android/java/src/org/chromium/base/TimezoneUtils.java",
11582+
"base/android/java/src/org/chromium/base/TraceEvent.java",
11583+
"base/android/java/src/org/chromium/base/UnguessableToken.java",
11584+
"base/android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java",
11585+
"base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java",
11586+
"base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java",
11587+
"base/android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java",
11588+
"base/android/java/src/org/chromium/base/memory/MemoryInfoBridge.java",
11589+
"base/android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java",
11590+
"base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java",
11591+
"base/android/java/src/org/chromium/base/task/PostTask.java",
11592+
"base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java",
11593+
"components/cronet/android/java/src/org/chromium/net/impl/CronetBidirectionalStream.java",
11594+
"components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java",
11595+
"components/cronet/android/java/src/org/chromium/net/impl/CronetUploadDataStream.java",
11596+
"components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java",
11597+
"components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java",
11598+
"net/android/java/src/org/chromium/net/AndroidCertVerifyResult.java",
11599+
"net/android/java/src/org/chromium/net/AndroidKeyStore.java",
11600+
"net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java",
11601+
"net/android/java/src/org/chromium/net/AndroidTrafficStats.java",
11602+
"net/android/java/src/org/chromium/net/DnsStatus.java",
11603+
"net/android/java/src/org/chromium/net/GURLUtils.java",
11604+
"net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java",
11605+
"net/android/java/src/org/chromium/net/HttpUtil.java",
11606+
"net/android/java/src/org/chromium/net/NetStringUtil.java",
11607+
"net/android/java/src/org/chromium/net/NetworkActiveNotifier.java",
11608+
"net/android/java/src/org/chromium/net/NetworkChangeNotifier.java",
11609+
"net/android/java/src/org/chromium/net/ProxyChangeListener.java",
11610+
"net/android/java/src/org/chromium/net/X509Util.java",
11611+
"url/android/java/src/org/chromium/url/IDNStringUtil.java",
11612+
],
1142411613
cmd: "mkdir -p $(genDir)/components/cronet/android && " +
1142511614
"mkdir -p $(genDir)/jni_headers/components/cronet/android && current_dir=`basename \\`pwd\\``; " +
1142611615
"for f in $(in); " +

‎android/tools/gn2bp/gn_utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,7 @@ def parse_gn_desc(self, gn_desc, gn_target_name, java_group_name=None, is_test_t
526526
target.proto_deps.add(dep.name)
527527
elif dep.type == 'group':
528528
target.update(dep, arch) # Bubble up groups's cflags/ldflags etc.
529+
target.transitive_jni_java_sources.update(dep.transitive_jni_java_sources)
529530
elif dep.type in ['action', 'action_foreach', 'copy']:
530531
target.arch[arch].deps.add(dep.name)
531532
target.transitive_jni_java_sources.update(dep.transitive_jni_java_sources)

0 commit comments

Comments
 (0)