DO NOT MERGE ANYWHERE - Update chromium-dev to use main branch.

Bug: b/289400079 Change-Id: Ic01880e477d68b2f516cd0858cf1fc30d1660827
Update manifest to match Chromium r292922.
2025-11-20 01:20:46 +08:00 · 2023-07-31 09:31:55 -07:00 · 2014-09-03 09:58:38 +01:00 · 2014-08-06 10:41:35 +01:00 · 2014-06-19 12:32:23 +01:00 · 2014-02-26 11:47:49 -08:00
2 changed files with 426 additions and 1038 deletions
--- a/GLOBAL-PREUPLOAD.cfg
+++ b/GLOBAL-PREUPLOAD.cfg
@@ -1,17 +0,0 @@
-# Settings in here control defaults for `repo upload` checks for all projects
-# listed in the manifest.  Do not turn on things here without first consulting
-# the wider Android team, and make sure you send out a PSA before landing.
-
-[Options]
-ignore_merged_commits = true
-
-[Builtin Hooks]
-commit_msg_test_field = true
-
-[Tool Paths]
-clang-format = ${REPO_ROOT}/prebuilts/clang/host/${BUILD_OS}/clang-stable/bin/clang-format
-git-clang-format = ${REPO_ROOT}/prebuilts/clang/host/${BUILD_OS}/clang-stable/bin/git-clang-format
-gofmt = ${REPO_ROOT}/prebuilts/go/${BUILD_OS}/bin/gofmt
-google-java-format = ${REPO_ROOT}/prebuilts/tools/common/google-java-format/google-java-format
-google-java-format-diff = ${REPO_ROOT}/prebuilts/tools/common/google-java-format/google-java-format-diff.py
-cpplint = ${REPO_ROOT}/external/google-styleguide/cpplint/cpplint.py
--- a/default.xml
+++ b/default.xml
Author	SHA1	Message	Date
Xin Li	63bf23117c	DO NOT MERGE ANYWHERE - Update chromium-dev to use main branch. Bug: b/289400079 Change-Id: Ic01880e477d68b2f516cd0858cf1fc30d1660827	2023-07-31 09:31:55 -07:00
Marcin Kosiba	44de82b41c	Update manifest to match Chromium r292922. Change-Id: Ib09ec74fd42104748d4e68824ee9c1686a36698f	2014-09-03 09:58:38 +01:00
Marcin Kosiba	3dd0fcf5b0	Update manifest to match Chromium r285014. Change-Id: I1a7009739e88d7d959439f699219906c431f31b8	2014-08-06 10:41:35 +01:00
Marcin Kosiba	3ce9857d46	Roll chromium-dev manifest to match Chromium ToT code. The Android manifest the Chromium project builds against has been updated (http://crrev.com/302843002/). This change updates the chromium-dev branch manifest to follow. Change-Id: Icc34d2be2dd5590d7d6533f262a5dfc8dcc9e92a	2014-06-19 12:32:23 +01:00
Conley Owens	d01ccf2c85	Setup chromium-dev manifest Change-Id: I7a9339f09c61e5fdc7fd8aff1bde8e70b93218bf	2014-02-26 11:47:49 -08:00
The Android Open Source Project	d0e8901ec0	Manifest for android-4.4_r1	2013-10-31 10:59:55 -07:00
The Android Open Source Project	5399a207d7	Manifest for android-4.3_r3.1	2013-09-19 17:30:02 -07:00
The Android Open Source Project	6c7205b958	Manifest for android-4.3_r3	2013-09-16 14:50:39 -07:00
The Android Open Source Project	3bed0c769d	Manifest for android-4.3_r3	2013-09-16 14:01:50 -07:00
The Android Open Source Project	9ca32f41b2	Manifest for android-4.3_r2.2	2013-08-22 09:00:29 -07:00
The Android Open Source Project	63f84526ff	Fixed manifest for android-4.3_r2.1 Change-Id: If80b3a9540a83532de85226d79e5d196bfb51786	2013-07-26 13:07:18 -07:00
The Android Open Source Project	95b5cdd352	Fixed manifest for android-4.3_r2.1 Change-Id: Ia884aedb2bba91b54090c86475642974542c024e	2013-07-25 11:25:57 -07:00
The Android Open Source Project	2a64bf2d94	Manifest for android-4.3_r2.1 Change-Id: Ia75b166ea7a31053c9268d3c07fb95feb0d2f11f	2013-07-23 19:19:56 -07:00
The Android Open Source Project	1739966098	Manifest for android-4.3_r2 Change-Id: Id4a23eac57b0ad7d6e5e0c576abeaaf2d3463f50	2013-07-23 19:19:53 -07:00
The Android Open Source Project	a1017b36e9	Manifest for android-4.3_r1 Change-Id: Iadf7254e52aeff84c59621aab55d47f9d15929d8	2013-07-23 19:19:49 -07:00
The Android Open Source Project	ca35e1a6d7	Manifest for android-4.3_r0.9.1 Change-Id: I8ae9397ba18566715352dd70f1d2d0d1a838980b	2013-07-23 19:19:45 -07:00
The Android Open Source Project	061132d493	Manifest for android-4.3_r0.9 Change-Id: Ib8d27995a95aba4b015a9532ebeff70547637cd7	2013-07-23 19:19:26 -07:00