chromium/src
0
Fork 0
Code Activity

add google/protobuf/internal/python_edition_defaults.py

Browse Source 
fix for
```
python3 ../../build/android/gyp/compile_resources.py --include-resources=../../third_party/android_sdk/public/platforms/android-35/android.jar --aapt2-path ../../third_party/android_build_tools/aapt2/cipd/aapt2 --dependencies-res-zips=@FileArg(gen/third_party/catapult/devil/empty_system_webview_apk.build_config.json:deps_info:dependency_zips) --extra-res-packages=@FileArg(gen/third_party/catapult/devil/empty_system_webview_apk.build_config.json:deps_info:extra_package_names) --min-sdk-version=26 --target-sdk-version=35 --webp-cache-dir=obj/android-webp-cache --android-manifest gen/third_party/catapult/devil/empty_system_webview_apk/AndroidManifest.merged.xml --srcjar-out gen/third_party/catapult/devil/empty_system_webview_apk__compile_resources.srcjar --version-code 1 --version-name Developer Build --arsc-path obj/third_party/catapult/devil/empty_system_webview_apk.ap_ --info-path obj/third_party/catapult/devil/empty_system_webview_apk.ap_.info --r-text-out gen/third_party/catapult/devil/empty_system_webview_apk__compile_resources_R.txt --dependencies-res-zip-overlays=@FileArg(gen/third_party/catapult/devil/empty_system_webview_apk.build_config.json:deps_info:dependency_zip_overlays) --proguard-file obj/third_party/catapult/devil/empty_system_webview_apk/empty_system_webview_apk.resources.proguard.txt --emit-ids-out=gen/third_party/catapult/devil/empty_system_webview_apk__compile_resources.resource_ids --depfile gen/third_party/catapult/devil/empty_system_webview_apk__compile_resources.d
Traceback (most recent call last):
  File "/b/f/w/out/x/../../build/android/gyp/compile_resources.py", line 34, in <module>
    from util import protoresources
  File "/b/f/w/build/android/gyp/util/protoresources.py", line 27, in <module>
    from proto import Resources_pb2
  File "/b/f/w/build/android/gyp/proto/Resources_pb2.py", line 9, in <module>
    from google.protobuf import reflection as _reflection
  File "/b/f/w/out/x/../../third_party/protobuf/python/google/protobuf/reflection.py", line 29, in <module>
    from google.protobuf import message_factory
  File "/b/f/w/out/x/../../third_party/protobuf/python/google/protobuf/message_factory.py", line 21, in <module>
    from google.protobuf import descriptor_pool
  File "/b/f/w/out/x/../../third_party/protobuf/python/google/protobuf/descriptor_pool.py", line 44, in <module>
    from google.protobuf.internal import python_edition_defaults
ImportError: cannot import name 'python_edition_defaults' from 'google.protobuf.internal'
```

Bug: 394948221
Change-Id: I10d327b44b6b459fc93ac8af3e27e4b7c274389d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6238761
Auto-Submit: Fumitoshi Ukai <ukai@google.com>
Reviewed-by: Junji Watanabe <jwata@google.com>
Commit-Queue: Fumitoshi Ukai <ukai@google.com>
Commit-Queue: Junji Watanabe <jwata@google.com>
Cr-Commit-Position: refs/heads/main@{#1417097}
This commit is contained in:
Fumitoshi Ukai
2025-02-06 17:14:23 -08:00
committed by Chromium LUCI CQ
parent 82dc0ba055
commit b8108d5382
2 changed files with 2 additions and 0 deletions

1
build/config/android/internal_rules.gni

@ -2271,6 +2271,7 @@ if (enable_java_templates) {
"//third_party/protobuf/python/google/protobuf/internal/message_listener.py",
"//third_party/protobuf/python/google/protobuf/internal/message_test.py",
"//third_party/protobuf/python/google/protobuf/internal/proto_builder_test.py",
"//third_party/protobuf/python/google/protobuf/internal/python_edition_defaults.py",
"//third_party/protobuf/python/google/protobuf/internal/python_message.py",
"//third_party/protobuf/python/google/protobuf/internal/reflection_test.py",
"//third_party/protobuf/python/google/protobuf/internal/service_reflection_test.py",

1
build/config/android/system_image.gni

@ -110,6 +110,7 @@ template("system_image_stub_apk") {
"//third_party/protobuf/python/google/protobuf/internal/message_listener.py",
"//third_party/protobuf/python/google/protobuf/internal/message_test.py",
"//third_party/protobuf/python/google/protobuf/internal/proto_builder_test.py",
"//third_party/protobuf/python/google/protobuf/internal/python_edition_defaults.py",
"//third_party/protobuf/python/google/protobuf/internal/python_message.py",
"//third_party/protobuf/python/google/protobuf/internal/reflection_test.py",
"//third_party/protobuf/python/google/protobuf/internal/service_reflection_test.py",