From b1861bfad04be77db4cb76b3be6364022755037f Mon Sep 17 00:00:00 2001 From: wchen342 Date: Wed, 3 Jul 2019 04:25:28 -0400 Subject: [PATCH] Update to 75.0.3770.100; change package name --- CHANGELOG.md | 11 +- build.sh | 5 +- domain_sub_2.list | 254 +----------------------------- misc/misc.sh | 3 +- patches/change_package_name.patch | 29 ++++ pruning_2.list | 12 -- 6 files changed, 46 insertions(+), 268 deletions(-) create mode 100644 patches/change_package_name.patch diff --git a/CHANGELOG.md b/CHANGELOG.md index c7ca550..289c1fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,11 @@ # 74.0.3729.169 -* first release \ No newline at end of file +* first release + +# 75.0.3770.80 +* reduce downloaded dependencies on gclient sync +* prune more binaries +* build gcm-client, eu-strip, closure-compiler from source; change error-prone to Maven version +* domain substitution on all non-binary files + +# 75.0.3770.100 +* Change package name to avoid conflict with chromium \ No newline at end of file diff --git a/build.sh b/build.sh index 53c4697..80b5264 100755 --- a/build.sh +++ b/build.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -eux -o pipefail -chromium_version=75.0.3770.80 +chromium_version=75.0.3770.100 target=monochrome_public_apk # Required tools: python2, python3, ninja, git, clang, lld, llvm, curl @@ -92,6 +92,9 @@ python3 ungoogled-chromium/utils/domain_substitution.py apply -r ungoogled-chrom ## Extra fixes for Chromium source # Fix an error in chrome/browser/android/rlz/rlz_ping_handler.cc: line 79, -rlz_lib::kFinancialServer +"about:blank" patch -p1 --ignore-whitespace -i patches/android-rlz-fix-missing-variable.patch --no-backup-if-mismatch +# Change package/App name +# patch src/chrome/android/BUILD.gn, src/chrome/android/java/res_chromium/values/channel_constants.xml +patch -p1 --ignore-whitespace -i patches/change_package_name.patch --no-backup-if-mismatch # Workaround for a building failure caused by safe browsing. The file is pre-generated with safe_browsing_mode=2. See https://github.com/nikolowry/bromite-builder/issues/1 # x86 mkdir -p src/out/Default/gen/chrome/common/safe_browsing diff --git a/domain_sub_2.list b/domain_sub_2.list index e73c288..bb5f2ab 100644 --- a/domain_sub_2.list +++ b/domain_sub_2.list @@ -21,13 +21,11 @@ ./ash/public/interfaces/login_screen.mojom ./ash/public/interfaces/login_user_info.mojom ./base/android/java/src/org/chromium/base/ApplicationStatus.java -./base/android/java/src/org/chromium/base/CollectionUtil.java ./base/android/java/src/org/chromium/base/ContextUtils.java ./base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java ./base/android/java/src/org/chromium/base/LocaleUtils.java ./base/android/java/src/org/chromium/base/PathUtils.java ./base/android/java/src/org/chromium/base/StrictModeContext.java -./base/android/jni_generator/java/src/org/chromium/jni_generator/JniProcessor.java ./base/android/junit/src/org/chromium/base/PiiEliderTest.java ./base/bind_unittest.nc ./base/BUILD.gn @@ -282,6 +280,7 @@ ./chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebappInfoTest.java ./chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebappLauncherActivityTest.java ./chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebappRegistryTest.java +./chrome/android/touchless/java/src/org/chromium/chrome/browser/touchless/ui/progressbar/PillProgressBarView.java ./chrome/android/touchless/javatests/src/org/chromium/chrome/browser/touchless/NoTouchActivityTest.java ./chrome/android/webapk/libs/client/junit/src/org/chromium/webapk/lib/client/WebApkValidatorTest.java ./chrome/android/webapk/libs/client/src/org/chromium/webapk/lib/client/WebApkValidator.java @@ -5260,7 +5259,6 @@ ./components/metrics/persisted_logs_unittest.cc ./components/metrics/reporting_service_unittest.cc ./components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadCallable.java -./components/module_installer/android/java/src-common/org/chromium/components/module_installer/ModuleInterfaceProcessor.java ./components/module_installer/android/java/src-impl/org/chromium/components/module_installer/ModuleInstaller.java ./components/nacl/broker/BUILD.gn ./components/ntp_snippets/contextual/proto/get_pivots_response.proto @@ -6518,41 +6516,9 @@ ./third_party/angle/third_party/deqp/src/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java ./third_party/angle/third_party/deqp/src/android/cts/runner/tests/src/com/drawelements/deqp/runner/DeqpTestRunnerTest.java ./third_party/angle/third_party/vulkan-tools/src/icd/VkICD_mock_icd.def -./third_party/auto/src/common/src/main/java/com/google/auto/common/AnnotationMirrors.java -./third_party/auto/src/common/src/main/java/com/google/auto/common/AnnotationValues.java -./third_party/auto/src/common/src/main/java/com/google/auto/common/BasicAnnotationProcessor.java -./third_party/auto/src/common/src/main/java/com/google/auto/common/MoreElements.java -./third_party/auto/src/common/src/main/java/com/google/auto/common/MoreTypes.java ./third_party/auto/src/common/src/main/java/com/google/auto/common/Overrides.java -./third_party/auto/src/common/src/main/java/com/google/auto/common/Visibility.java -./third_party/auto/src/common/src/test/java/com/google/auto/common/AnnotationMirrorsTest.java -./third_party/auto/src/common/src/test/java/com/google/auto/common/BasicAnnotationProcessorTest.java -./third_party/auto/src/common/src/test/java/com/google/auto/common/MoreElementsTest.java -./third_party/auto/src/common/src/test/java/com/google/auto/common/MoreTypesIsTypeOfTest.java -./third_party/auto/src/common/src/test/java/com/google/auto/common/MoreTypesTest.java ./third_party/auto/src/common/src/test/java/com/google/auto/common/OverridesTest.java -./third_party/auto/src/common/src/test/java/com/google/auto/common/SuperficialValidationTest.java -./third_party/auto/src/common/src/test/java/com/google/auto/common/VisibilityTest.java -./third_party/auto/src/factory/src/it/functional/src/test/java/com/google/auto/factory/DependencyInjectionIntegrationTest.java -./third_party/auto/src/factory/src/main/java/com/google/auto/factory/processor/AnnotationValues.java -./third_party/auto/src/factory/src/main/java/com/google/auto/factory/processor/AutoFactoryDeclaration.java -./third_party/auto/src/factory/src/main/java/com/google/auto/factory/processor/AutoFactoryProcessor.java -./third_party/auto/src/factory/src/main/java/com/google/auto/factory/processor/Elements2.java -./third_party/auto/src/factory/src/main/java/com/google/auto/factory/processor/FactoryDescriptorGenerator.java -./third_party/auto/src/factory/src/main/java/com/google/auto/factory/processor/FactoryDescriptor.java -./third_party/auto/src/factory/src/main/java/com/google/auto/factory/processor/FactoryMethodDescriptor.java -./third_party/auto/src/factory/src/main/java/com/google/auto/factory/processor/FactoryWriter.java -./third_party/auto/src/factory/src/main/java/com/google/auto/factory/processor/ImplementationMethodDescriptor.java -./third_party/auto/src/factory/src/main/java/com/google/auto/factory/processor/Key.java -./third_party/auto/src/factory/src/main/java/com/google/auto/factory/processor/Mirrors.java -./third_party/auto/src/factory/src/main/java/com/google/auto/factory/processor/Parameter.java -./third_party/auto/src/factory/src/main/java/com/google/auto/factory/processor/ProvidedChecker.java -./third_party/auto/src/factory/src/main/java/com/google/auto/factory/processor/ProviderField.java -./third_party/auto/src/factory/src/test/java/com/google/auto/factory/processor/AutoFactoryDeclarationTest.java -./third_party/auto/src/factory/src/test/java/com/google/auto/factory/processor/AutoFactoryProcessorTest.java ./third_party/auto/src/pom.xml -./third_party/auto/src/service/src/main/java/com/google/auto/service/processor/AutoServiceProcessor.java -./third_party/auto/src/service/src/main/java/com/google/auto/service/processor/ServicesFiles.java ./third_party/auto/src/value/src/it/functional/src/main/java/com/google/auto/value/NestedValueType.java ./third_party/auto/src/value/src/it/functional/src/main/java/com/google/auto/value/SimpleValueType.java ./third_party/auto/src/value/src/it/functional/src/main/java/PackagelessNestedValueType.java @@ -6573,21 +6539,13 @@ ./third_party/auto/src/value/src/it/functional/src/test/java/com/google/auto/value/gwt/SerialSignatureTest.java ./third_party/auto/src/value/src/it/functional/src/test/java/com/google/auto/value/SimpleValueTypeTest.java ./third_party/auto/src/value/src/it/functional/src/test/java/PackagelessValueTypeTest.java -./third_party/auto/src/value/src/it/gwtserializer/src/test/java/com/google/auto/value/client/GwtSerializerTest.java ./third_party/auto/src/value/src/main/java/com/google/auto/value/AutoAnnotation.java ./third_party/auto/src/value/src/main/java/com/google/auto/value/extension/AutoValueExtension.java -./third_party/auto/src/value/src/main/java/com/google/auto/value/extension/memoized/MemoizedValidator.java -./third_party/auto/src/value/src/main/java/com/google/auto/value/extension/memoized/MemoizeExtension.java ./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/AbortProcessingException.java ./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/AnnotationOutput.java ./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/AutoAnnotationProcessor.java ./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/AutoAnnotationTemplateVars.java -./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/AutoValueBuilderProcessor.java -./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/AutoValueProcessor.java ./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/AutoValueTemplateVars.java -./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/BuilderMethodClassifier.java -./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/BuilderSpec.java -./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/EclipseHack.java ./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/escapevelocity/ConstantExpressionNode.java ./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/escapevelocity/DirectiveNode.java ./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/escapevelocity/EvaluationContext.java @@ -6601,28 +6559,19 @@ ./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/escapevelocity/Reparser.java ./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/escapevelocity/Template.java ./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/escapevelocity/TokenNode.java -./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/ExtensionContext.java -./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/GwtSerialization.java ./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/Optionalish.java -./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/PropertyBuilderClassifier.java ./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/Reformatter.java -./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/TemplateVars.java ./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/TypeEncoder.java ./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/TypeMirrorSet.java ./third_party/auto/src/value/src/main/java/com/google/auto/value/processor/TypeSimplifier.java -./third_party/auto/src/value/src/test/java/com/google/auto/value/extension/memoized/MemoizedMethodSubjectFactory.java -./third_party/auto/src/value/src/test/java/com/google/auto/value/extension/memoized/MemoizedMethodSubject.java -./third_party/auto/src/value/src/test/java/com/google/auto/value/extension/memoized/MemoizedTest.java ./third_party/auto/src/value/src/test/java/com/google/auto/value/processor/AutoAnnotationCompilationTest.java ./third_party/auto/src/value/src/test/java/com/google/auto/value/processor/AutoAnnotationErrorsTest.java ./third_party/auto/src/value/src/test/java/com/google/auto/value/processor/CompilationTest.java ./third_party/auto/src/value/src/test/java/com/google/auto/value/processor/escapevelocity/ReferenceNodeTest.java ./third_party/auto/src/value/src/test/java/com/google/auto/value/processor/escapevelocity/TemplateTest.java -./third_party/auto/src/value/src/test/java/com/google/auto/value/processor/ExtensionTest.java ./third_party/auto/src/value/src/test/java/com/google/auto/value/processor/GeneratedDoesNotExistTest.java ./third_party/auto/src/value/src/test/java/com/google/auto/value/processor/GuavaCollectionBuildersTest.java ./third_party/auto/src/value/src/test/java/com/google/auto/value/processor/JavaScannerTest.java -./third_party/auto/src/value/src/test/java/com/google/auto/value/processor/PropertyAnnotationsTest.java ./third_party/auto/src/value/src/test/java/com/google/auto/value/processor/ReformatterTest.java ./third_party/auto/src/value/src/test/java/com/google/auto/value/processor/SimplifyWithAnnotationsTest.java ./third_party/auto/src/value/src/test/java/com/google/auto/value/processor/TemplateVarsTest.java @@ -6661,11 +6610,6 @@ ./third_party/blink/renderer/core/paint/first_meaningful_paint_detector.cc ./third_party/blink/renderer/core/paint/first_meaningful_paint_detector.h ./third_party/blink/renderer/core/timing/performance_resource_timing.h -./third_party/blink/renderer/devtools/scripts/closure/closure_runner/src/org/chromium/devtools/compiler/Runner.java -./third_party/blink/renderer/devtools/scripts/jsdoc_validator/src/org/chromium/devtools/jsdoc/checks/AstUtil.java -./third_party/blink/renderer/devtools/scripts/jsdoc_validator/src/org/chromium/devtools/jsdoc/checks/FunctionReceiverChecker.java -./third_party/blink/renderer/devtools/scripts/jsdoc_validator/src/org/chromium/devtools/jsdoc/checks/MethodAnnotationChecker.java -./third_party/blink/renderer/devtools/scripts/jsdoc_validator/src/org/chromium/devtools/jsdoc/checks/TypeRecord.java ./third_party/blink/renderer/modules/bluetooth/bluetooth_error.cc ./third_party/blink/renderer/modules/encryptedmedia/encrypted_media_utils.h ./third_party/blink/renderer/modules/geolocation/geolocation.cc @@ -7529,6 +7473,7 @@ ./third_party/blink/web_tests/external/wpt/css/css-flexbox/order/order-with-column-reverse-ref.html ./third_party/blink/web_tests/external/wpt/css/css-flexbox/order/order-with-row-reverse.html ./third_party/blink/web_tests/external/wpt/css/css-flexbox/order/order-with-row-reverse-ref.html +./third_party/blink/web_tests/external/wpt/css/css-flexbox/overflow-auto-001.html ./third_party/blink/web_tests/external/wpt/css/css-flexbox/parsing/flex-basis-invalid.html ./third_party/blink/web_tests/external/wpt/css/css-flexbox/parsing/flex-basis-valid.html ./third_party/blink/web_tests/external/wpt/css/css-flexbox/parsing/flex-direction-invalid.html @@ -12836,9 +12781,6 @@ ./third_party/cacheinvalidation/src/google/cacheinvalidation/channel_common.proto ./third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidChannelConstants.java ./third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/GcmUpstreamSenderService.java -./third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/util/Preconditions.java -./third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/util/ProtoWrapper.java -./third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/util/TypedUtil.java ./third_party/cacheinvalidation/src/javaexample/com/google/ipc/invalidation/examples/android2/MainActivity.java ./third_party/catapult/catapult_build/run_dev_server_tests.py ./third_party/catapult/catapult_build/test_runner.py @@ -12966,185 +12908,18 @@ ./third_party/custom_tabs_client/src/demos/src/main/res/values/strings.xml ./third_party/dawn/src/dawn_native/vulkan/VulkanInfo.cpp ./third_party/dom_distiller_js/dist/test/data/out/domdistillerjstest.js -./third_party/feed/src/src/main/java/com/google/android/libraries/feed/common/testing/ModelProviderValidator.java -./third_party/feed/src/src/main/java/com/google/android/libraries/feed/common/testing/PagingState.java -./third_party/feed/src/src/main/java/com/google/android/libraries/feed/common/testing/RunnableSubject.java -./third_party/feed/src/src/main/java/com/google/android/libraries/feed/common/testing/SessionTestUtils.java -./third_party/feed/src/src/main/java/com/google/android/libraries/feed/common/time/testing/FakeClock.java -./third_party/feed/src/src/main/java/com/google/android/libraries/feed/feedsessionmanager/internal/testing/AbstractSessionImplTest.java -./third_party/feed/src/src/main/java/com/google/android/libraries/feed/feedstore/testing/AbstractClearableFeedStoreTest.java -./third_party/feed/src/src/main/java/com/google/android/libraries/feed/feedstore/testing/AbstractFeedStoreTest.java ./third_party/feed/src/src/main/java/com/google/android/libraries/feed/host/config/ApplicationInfo.java ./third_party/feed/src/src/main/java/com/google/android/libraries/feed/hostimpl/storage/PersistentJournalStorage.java ./third_party/feed/src/src/main/java/com/google/android/libraries/feed/piet/ui/GradientShader.java ./third_party/feed/src/src/main/java/com/google/android/libraries/feed/testing/conformance/network/NetworkClientConformanceTest.java -./third_party/feed/src/src/main/java/com/google/android/libraries/feed/testing/conformance/storage/ContentStorageConformanceTest.java -./third_party/feed/src/src/main/java/com/google/android/libraries/feed/testing/conformance/storage/ContentStorageDirectConformanceTest.java -./third_party/feed/src/src/main/java/com/google/android/libraries/feed/testing/conformance/storage/JournalStorageConformanceTest.java -./third_party/feed/src/src/main/java/com/google/android/libraries/feed/testing/conformance/storage/JournalStorageDirectConformanceTest.java -./third_party/feed/src/src/main/java/com/google/android/libraries/feed/testing/modelprovider/FakeModelCursor.java -./third_party/feed/src/src/main/java/com/google/android/libraries/feed/testing/modelprovider/FakeModelProvider.java ./third_party/feed/src/src/main/proto/search/now/ui/piet/images.proto ./third_party/feed/src/src/main/proto/search/now/ui/piet/media_queries.proto ./third_party/feed/src/src/main/proto/search/now/ui/piet/shadows.proto ./third_party/feed/src/src/main/proto/search/now/wire/feed/display_info.proto -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/api/common/MutationContextTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/api/common/ThreadUtilsTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/api/knowncontent/ContentMetadataTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/api/scope/ClearAllListenerTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/api/scope/FeedProcessScopeTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/api/scope/FeedStreamScopeTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/basicstream/BasicStreamTest.java ./third_party/feed/src/src/test/java/com/google/android/libraries/feed/basicstream/internal/actions/StreamActionApiImplTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/CardDriverTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ClusterDriverTest.java ./third_party/feed/src/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContentDriverTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ContinuationDriverTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/HeaderDriverTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/NoContentDriverTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/StreamDriverTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/ZeroStateDriverTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/basicstream/internal/scroll/ScrollRestorerTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/basicstream/internal/StreamItemAnimatorTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/basicstream/internal/StreamItemTouchCallbacksTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/basicstream/internal/StreamRecyclerViewAdapterTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/ContinuationViewHolderTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/HeaderViewHolderTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/NoContentViewHolderTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/PietViewHolderTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/ZeroStateViewHolderTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/common/concurrent/CancelableRunnableTaskTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/common/concurrent/SimpleSettableFutureTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/common/concurrent/TaskQueueTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/common/feedobservable/FeedObservableTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/common/intern/HashPoolInternerTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/common/intern/InternedMapTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/common/intern/InternerWithStatsTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/common/intern/WeakPoolInternerTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/common/locale/LocaleUtilsTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/common/logging/DumperTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/common/logging/LoggerTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/common/ResultTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/common/testing/RequiredConsumerTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/common/testing/RunnableSubjectTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/common/ui/LayoutUtilsTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/common/ValidatorsTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedactionmanager/FeedActionManagerImplTest.java ./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedactionparser/FeedActionParserTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedactionreader/FeedActionReaderTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedknowncontent/FeedKnownContentApiTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedmodelprovider/FeedModelProviderFactoryTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedmodelprovider/FeedModelProviderTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedmodelprovider/internal/FeatureChangeImplTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedmodelprovider/internal/ModelCursorImplTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedmodelprovider/internal/ModelFeatureImplTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedmodelprovider/internal/ModelMutationImplTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedmodelprovider/internal/ModelTokenImplTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedprotocoladapter/FeedProtocolAdapterTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedprotocoladapter/internal/transformers/ContentDataOperationTransformerTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedprotocoladapter/internal/transformers/FeatureDataOperationTransformerTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedrequestmanager/FeedActionUploadRequestManagerTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedrequestmanager/FeedRequestManagerTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedrequestmanager/internal/UtilsTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedrequestmanager/UploadableActionsRequestBuilderTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedsessionmanager/FeedSessionManagerTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/ContentCacheTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/HeadAsStructureTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/HeadSessionImplTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/SessionCacheTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/SessionContentTrackerTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/SessionImplTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/SessionManagerMutationTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/TimeoutSessionImplTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedstore/FeedStoreTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedstore/internal/ContentGcTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedstore/internal/LocalActionGcTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/feedstore/internal/PersistentFeedStoreTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/host/config/ConfigurationTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/hostimpl/network/NetworkClientWrapperTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/hostimpl/scheduler/SchedulerApiWrapperTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/hostimpl/storage/PersistentContentStorageDirectTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/hostimpl/storage/PersistentContentStorageTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/hostimpl/storage/PersistentJournalStorageDirectTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/hostimpl/storage/PersistentJournalStorageTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/host/network/HttpHeaderTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/host/network/HttpRequestTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/host/storage/CommitResultTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/ClearAllTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/ContentRemoveTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/ContentUpdateTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/EmptyStreamTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/ExistingSessionTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/FilterHeadTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/GcTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/MultiSessionPagingTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/NoRequestWithContentTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/NoRequestWithTimeoutTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/NoRequestWithWaitTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/RemoveTrackingBehaviorTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/RequestWithContentTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/RequestWithTimeoutTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/RequestWithWaitTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/RootOnlyTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/SemanticPropertiesTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/SharedStateTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/SimpleStreamTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/StreamPagingTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/StructureUpdateTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/SyntheticTokensTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/TimeoutSessionBaseTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/infraintegration/TimeoutSessionWithContentTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/internalapi/modelprovider/RemoveTrackingTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/internalapi/modelprovider/TokenCompletedTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/mocknetworkclient/MockServerNetworkClientTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/ChunkedTextElementAdapterTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/CustomElementAdapterTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/DebugLoggerTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/ElementAdapterFactoryTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/ElementAdapterTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/ElementContainerAdapterTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/ElementListAdapterTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/ElementStackAdapterTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/FrameAdapterImplTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/FrameContextTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/GridRowAdapterTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/host/AssetProviderTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/ImageElementAdapterTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/KeyedRecyclerPoolTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/LoadImageCallbackTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/MediaQueryHelperTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/ParameterizedTextElementAdapterFactoryTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/ParameterizedTextElementAdapterTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/ParameterizedTextEvaluatorTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/PietManagerImplTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/PietStylesHelperTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/SingleKeyRecyclerPoolTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/StyleProviderTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/TemplateBinderTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/TextElementAdapterTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/ui/AspectRatioScalingImageViewTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/ui/BorderDrawableTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/ui/GradientDrawableTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/ui/GradientShaderTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/ui/GridRowViewTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/ui/RoundedCornerMaskCacheTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/ui/RoundedCornerViewHelperTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/ui/RoundedCornerWrapperViewTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/piet/ViewUtilsTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/ContextMenuManagerImplTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/FloatingContextMenuManagerTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/sharedstream/deepestcontenttracker/DeepestContentTrackerTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/sharedstream/logging/SpinnerLoggerTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/sharedstream/logging/UiSessionRequestLoggerTest.java ./third_party/feed/src/src/test/java/com/google/android/libraries/feed/sharedstream/offlinemonitor/StreamOfflineMonitorTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/sharedstream/piet/PietCustomElementProviderTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/sharedstream/piet/PietHostBindingProviderTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/sharedstream/piet/PietStringFormatterTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/sharedstream/publicapi/menumeasurer/MenuMeasurerTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/sharedstream/removetrackingfactory/StreamRemoveTrackingFactoryTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/sharedstream/scroll/ScrollRestoreHelperTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/sharedstream/scroll/ScrollTrackerTest.java -./third_party/feed/src/src/test/java/com/google/android/libraries/feed/sharedstream/ui/MaterialSpinnerViewTest.java ./third_party/ffmpeg/libavcodec/aacdec.c ./third_party/ffmpeg/libavcodec/aacdec_fixed.c ./third_party/ffmpeg/libavcodec/aacdectab.h @@ -13257,7 +13032,6 @@ ./third_party/ffmpeg/libswscale/x86/scale.asm ./third_party/flatbuffers/src/dart/pubspec.yaml ./third_party/flatbuffers/src/java/com/google/flatbuffers/Utf8Safe.java -./third_party/flatbuffers/src/tests/MyGame/Example/MonsterStorageGrpc.java ./third_party/flot/excanvas.min.js ./third_party/gif_player/src/jp/tomorrowkey/android/gifplayer/BaseGifDrawable.java ./third_party/google_input_tools/third_party/closure_library/closure/goog/array/array.js @@ -13286,7 +13060,6 @@ ./third_party/grpc/src/src/objective-c/tests/GRPCClientTests.m ./third_party/grpc/src/src/objective-c/tests/InteropTests.m ./third_party/grpc/src/src/proto/grpc/lb/v1/load_balancer.proto -./third_party/grpc/src/src/python/grpcio_status/setup.py ./third_party/grpc/src/src/ruby/ext/grpc/rb_grpc_imports.generated.c ./third_party/grpc/src/src/ruby/ext/grpc/rb_grpc_imports.generated.h ./third_party/grpc/src/test/core/security/credentials_test.cc @@ -13306,22 +13079,8 @@ ./third_party/junit/src/src/main/java/org/junit/internal/Throwables.java ./third_party/junit/src/src/site/xdoc/index.xml ./third_party/junit/src/src/test/java/org/junit/tests/assertion/MultipleFailureExceptionTest.java -./third_party/libaddressinput/src/android/src/androidTest/java/com/android/i18n/addressinput/AddressAutocompleteControllerTest.java -./third_party/libaddressinput/src/android/src/androidTest/java/com/android/i18n/addressinput/autocomplete/gmscore/AddressAutocompleteApiImplTest.java -./third_party/libaddressinput/src/android/src/androidTest/java/com/android/i18n/addressinput/PlaceDetailsClientTest.java -./third_party/libaddressinput/src/android/src/main/java/com/android/i18n/addressinput/AddressAutocompleteController.java -./third_party/libaddressinput/src/android/src/main/java/com/android/i18n/addressinput/autocomplete/gmscore/AddressAutocompleteApiImpl.java -./third_party/libaddressinput/src/android/src/main/java/com/android/i18n/addressinput/PlaceDetailsApi.java ./third_party/libaddressinput/src/android/src/main/java/com/android/i18n/addressinput/PlaceDetailsClient.java -./third_party/libaddressinput/src/common/src/main/java/com/google/i18n/addressinput/common/AddressAutocompleteApi.java ./third_party/libaddressinput/src/common/src/main/java/com/google/i18n/addressinput/common/SimpleClientCacheManager.java -./third_party/libaddressinput/src/common/src/test/java/com/google/i18n/addressinput/common/AddressDataTest.java -./third_party/libaddressinput/src/common/src/test/java/com/google/i18n/addressinput/common/CacheDataTest.java -./third_party/libaddressinput/src/common/src/test/java/com/google/i18n/addressinput/common/ClientDataTest.java -./third_party/libaddressinput/src/common/src/test/java/com/google/i18n/addressinput/common/FieldVerifierTest.java -./third_party/libaddressinput/src/common/src/test/java/com/google/i18n/addressinput/common/FormatInterpreterTest.java -./third_party/libaddressinput/src/common/src/test/java/com/google/i18n/addressinput/common/FormControllerTest.java -./third_party/libaddressinput/src/common/src/test/java/com/google/i18n/addressinput/common/StandardAddressVerifierTest.java ./third_party/libphonenumber/dist/java/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java ./third_party/libphonenumber/dist/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java ./third_party/libphonenumber/dist/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java @@ -13875,18 +13634,12 @@ ./third_party/webrtc/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java ./third_party/webrtc/sdk/android/api/org/webrtc/PeerConnection.java ./third_party/webrtc/sdk/android/api/org/webrtc/SurfaceTextureHelper.java -./third_party/webrtc/sdk/android/instrumentationtests/src/org/webrtc/BuiltinAudioCodecsFactoryFactoryTest.java ./third_party/webrtc/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionTest.java -./third_party/webrtc/sdk/android/instrumentationtests/src/org/webrtc/RtcCertificatePemTest.java ./third_party/webrtc/sdk/android/src/java/org/webrtc/Camera1Session.java ./third_party/webrtc/sdk/android/src/java/org/webrtc/Camera2Session.java ./third_party/webrtc/sdk/android/src/java/org/webrtc/EglBase14Impl.java ./third_party/webrtc/sdk/android/src/jni/jvm.cc -./third_party/webrtc/sdk/android/tests/src/org/webrtc/AndroidVideoDecoderTest.java -./third_party/webrtc/sdk/android/tests/src/org/webrtc/CodecTestHelper.java -./third_party/webrtc/sdk/android/tests/src/org/webrtc/CryptoOptionsTest.java ./third_party/webrtc/sdk/android/tests/src/org/webrtc/FakeMediaCodecWrapper.java -./third_party/webrtc/sdk/android/tests/src/org/webrtc/HardwareVideoEncoderTest.java ./third_party/webrtc/tools_webrtc/mb/mb.py ./third_party/yasm/source/patched-yasm/libyasm/tests/opt-gvmat64.asm ./third_party/zlib/google/compression_utils.cc @@ -13911,9 +13664,6 @@ ./tools/checklicenses/checklicenses.py ./tools/chrome_proxy/testserver/server.go ./tools/emacs/gn.el -./tools/gn.bak/bootstrap/bootstrap.py -./tools/gn/tools/gn/misc/emacs/gn-mode.el -./tools/gn/tools/gn/visual_studio_writer.cc ./tools/ipc_fuzzer/message_lib/all_message_null_macros.h ./tools/ipc_fuzzer/message_lib/all_messages.h ./tools/ipc_fuzzer/message_lib/BUILD.gn diff --git a/misc/misc.sh b/misc/misc.sh index c5215fe..e8d60ea 100644 --- a/misc/misc.sh +++ b/misc/misc.sh @@ -13,7 +13,7 @@ ## Create second pruning list pruning_list_2="pruning_2.list" pushd src -find . ! '(' -size 0 -o -size 1 -o -name '*.py' -o -name '*.pyc' -o -name '*.java' -o -name '*.h' -o -name '*.c' -o -name '*.cc' -o -name '*.m' -o -name '*.mm' -o -name '*.cpp' -o -name '*.asm' -o -name '*.rb' -o -name '*.mojom' -o -name '*.hlsl' -o -name '*.bat' -o -name '*.sh' -o -name '*.am' -o -name '*.map' -o -name '*.go' -o -name '*.aidl' -o -name '*.ac' -o -name '*.m4' -o -name '*.idl' -o -name '*.fidl' -o -name '*.yaml' -o -name '*.nc' -o -name '*.el' -o -name '*.tcl' -o -iname '*.png' -o -iname '*.gif' -o -name '*.svg' -o -iname '*.jpg' -o -iname '*.wav' -o -name '*.webp' -o -name '*.webm' -o -name '*.tiff' -o -iname '*.bmp' -o -name '*.ico' -o -name '*.icon' -o -name '*.icns' -o -name '*.mp3' -o -name '*.pdf' -o -name '*.flac' -o -name '*.ogg' -o -name '*.ai' -o -name '*.cur' -o -name '*.xcf' -o -name '*.xml' -o -name '*.css' -o -name '*.htm' -o -name '*.html' -o -name '*.xhtml' -o -name '*.js' -o -name '*.json' -o -name '*.json5' -o -name '*.jsonp' -o -name '*.headers' -o -name '*.xsl' -o -name '*.ttf' -o -name '*.woff' -o -name '*.woff2' -o -name '*.info' -o -name '*.golden' -o -name '*.ninja' -o -name '*.gn' -o -name '*.gni' -o -name '*.config' -o -name '*.cfg' -o -name '*.flags' -o -name '*.proto' -o -name '*.ver' -o -name '*.def' -o -name '*.vim' -o -name '*.gradle' -o -name 'gradlew' -o -name '*.jinja' -o -name '*.jinja2' -o -name '*.typemap' -o -name '*.settings' -o -name '*.pydeps' -o -name '*.test' -o -name '*.ps1' -o -name '*.pyl' -o -name '*.csv' -o -name '*.ztf' -o -name '*.filter' -o -name '*.asciipb' -o -name '*.version' -o -name '*.skeletons' -o -name '*.fbs' -o -name '*.lst' -o -name '*.list' -o -name '*.sig' -o -name '*.sigs' -o -name '*.fragment' -o -name '*.grd' -o -name '*.grdp' -o -name '*.tmpl' -o -name '*.template' -o -name '*.md5' -o -name '*.sha1' -o -name '*.plist' -o -name '*.xtb' -o -name '*.in' -o -name '*.manifest' -o -name '*.properties' -o -name '*.chromium' -o -name '*.txt' -o -name '*.yml' -o -name '*.md' -o -name '*.diff' -o -name '*.patch' -o -name '*.cmake' -o -name 'Makefile' -o -name 'Dockerfile' -o -name 'pylintrc' -o -name 'resource_ids' -o -name '*.README' -o -name 'README' -o -name 'COPYING' -o -name 'AUTHORS' -o -name 'DEPS' -o -name 'OWNERS' -o -name 'VERSION' -o -name 'LICENSE' -o -name 'PKG-INFO' -o -name 'WORKSPACE' -o -name 'BUILD' -o -name '*.BUILD' -o -name '.gitignore' -o -name '.git-blame-ignore-revs' ')' -type f -exec grep -IL . "{}" \; | grep -v -E '/\.git/|/test/data/|/test_data/|/examples/|/web_tests/|/testdata/|/eu-strip/|/android_sdk/|/android_tools/|icudtl\.dat|chromium-debug\.keystore|gradle-wrapper\.jar|afdo\.prof|/ulp_language_code_locator/' > "../${pruning_list_2}" +find . ! '(' -size 0 -o -size 1 -o -name '*.py' -o -name '*.pyc' -o -name '*.java' -o -name '*.h' -o -name '*.c' -o -name '*.cc' -o -name '*.m' -o -name '*.mm' -o -name '*.cpp' -o -name '*.asm' -o -name '*.rb' -o -name '*.mojom' -o -name '*.hlsl' -o -name '*.bat' -o -name '*.sh' -o -name '*.am' -o -name '*.map' -o -name '*.go' -o -name '*.aidl' -o -name '*.ac' -o -name '*.m4' -o -name '*.idl' -o -name '*.fidl' -o -name '*.yaml' -o -name '*.nc' -o -name '*.el' -o -name '*.tcl' -o -iname '*.png' -o -iname '*.gif' -o -name '*.svg' -o -iname '*.jpg' -o -iname '*.wav' -o -name '*.webp' -o -name '*.webm' -o -name '*.tiff' -o -iname '*.bmp' -o -name '*.ico' -o -name '*.icon' -o -name '*.icns' -o -name '*.mp3' -o -name '*.pdf' -o -name '*.flac' -o -name '*.ogg' -o -name '*.ai' -o -name '*.cur' -o -name '*.xcf' -o -name '*.xml' -o -name '*.css' -o -name '*.htm' -o -name '*.html' -o -name '*.xhtml' -o -name '*.js' -o -name '*.json' -o -name '*.json5' -o -name '*.jsonp' -o -name '*.headers' -o -name '*.xsl' -o -name '*.ttf' -o -name '*.woff' -o -name '*.woff2' -o -name '*.info' -o -name '*.golden' -o -name '*.ninja' -o -name '*.gn' -o -name '*.gni' -o -name '*.config' -o -name '*.cfg' -o -name '*.flags' -o -name '*.proto' -o -name '*.ver' -o -name '*.def' -o -name '*.vim' -o -name '*.gradle' -o -name 'gradlew' -o -name '*.jinja' -o -name '*.jinja2' -o -name '*.typemap' -o -name '*.settings' -o -name '*.pydeps' -o -name '*.test' -o -name '*.ps1' -o -name '*.pyl' -o -name '*.csv' -o -name '*.ztf' -o -name '*.filter' -o -name '*.asciipb' -o -name '*.version' -o -name '*.skeletons' -o -name '*.fbs' -o -name '*.lst' -o -name '*.list' -o -name '*.sig' -o -name '*.sigs' -o -name '*.fragment' -o -name '*.grd' -o -name '*.grdp' -o -name '*.tmpl' -o -name '*.template' -o -name '*.md5' -o -name '*.sha1' -o -name '*.plist' -o -name '*.xtb' -o -name '*.in' -o -name '*.manifest' -o -name '*.properties' -o -name '*.chromium' -o -name '*.txt' -o -name '*.yml' -o -name '*.md' -o -name '*.diff' -o -name '*.patch' -o -name '*.cmake' -o -name 'Makefile' -o -name 'Dockerfile' -o -name 'pylintrc' -o -name 'resource_ids' -o -name '*.README' -o -name 'README' -o -name 'COPYING' -o -name 'AUTHORS' -o -name 'DEPS' -o -name 'OWNERS' -o -name 'VERSION' -o -name 'LICENSE' -o -name 'PKG-INFO' -o -name 'WORKSPACE' -o -name 'BUILD' -o -name '*.BUILD' -o -name '.gitignore' -o -name '.git-blame-ignore-revs' ')' -type f -exec grep -IL . "{}" \; | grep -v -E '/\.git/|/test/|/test_data/|/examples/|/web_tests/|/testdata/|/eu-strip/|/android_sdk/|/android_tools/|icudt.\.dat|chromium-debug\.keystore|gradle-wrapper\.jar|afdo\.prof|/ulp_language_code_locator/|error_prone_ant|/closure_compiler/|/dom_distiller/|/desugar/' > "../${pruning_list_2}" popd @@ -37,4 +37,3 @@ done < ../ungoogled-chromium/domain_regex.list sort -u "../${substitution_list_temp}" | uniq > "../${substitution_list_2}" rm "../${substitution_list_temp}" popd - diff --git a/patches/change_package_name.patch b/patches/change_package_name.patch new file mode 100644 index 0000000..c70a6f6 --- /dev/null +++ b/patches/change_package_name.patch @@ -0,0 +1,29 @@ +description: change package name to allow co-existence with original Chromium +author: Wengling Chen + +--- a/src/chrome/android/BUILD.gn ++++ b/src/chrome/android/BUILD.gn +@@ -38,8 +38,8 @@ + import("//chrome/android/features/vr/vr_module_tmpl.gni") + } + +-manifest_package = "org.chromium.chrome" +-test_manifest_package = "org.chromium.chrome.tests" ++manifest_package = "org.ungoogled.chromium" ++test_manifest_package = "org.ungoogled.chromium.tests" + + chrome_public_jinja_variables = default_chrome_public_jinja_variables + + [ "manifest_package=$manifest_package" ] + + +--- a/src/chrome/android/java/res_chromium/values/channel_constants.xml ++++ b/src/chrome/android/java/res_chromium/values/channel_constants.xml +@@ -5,7 +5,7 @@ + + + +- Chromium ++ Ungoogled Chromium + Chromium bookmarks + Chromium search + diff --git a/pruning_2.list b/pruning_2.list index 3e5447a..a671d7f 100644 --- a/pruning_2.list +++ b/pruning_2.list @@ -1,18 +1,6 @@ ./third_party/junit/src/lib/hamcrest-core-1.3.jar ./third_party/junit/src/lib/hamcrest-core-1.3-sources.jar -./third_party/junit/src/src/test/resources/junit/tests/runner/testRunFailureResultCanBeSerialised -./third_party/junit/src/src/test/resources/junit/tests/runner/testRunSuccessResultCanBeSerialised ./third_party/android_protobuf/src/benchmarks/google_message2.dat -./third_party/sqlite/patched/test/fuzzdata1.db -./third_party/sqlite/patched/test/sessionfuzz-data1.db -./third_party/sqlite/patched/test/fuzzdata7.db -./third_party/sqlite/patched/test/fuzzdata5.db -./third_party/sqlite/patched/test/fuzzdata2.db -./third_party/sqlite/patched/test/dbfuzz2-seed1.db -./third_party/sqlite/patched/test/fuzzdata8.db -./third_party/sqlite/patched/test/fuzzdata3.db -./third_party/sqlite/patched/test/fuzzdata6.db -./third_party/sqlite/patched/test/fuzzdata4.db ./chrome/browser/resource_coordinator/tab_ranker/example_preprocessor_config.pb ./chrome/common/extensions/docs/static/images/app_codelab/step7-completed ./chrome/common/win/eventlog_messages.mc \ No newline at end of file