LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,175 Commits 2 Branches 0 Tags
c01e8b38b1457dfe00aff5cc18be03359ea786dd
Commit Graph

33175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Maurer
c01e8b38b1 Merge changes I4c3744e0,I91d8de92 am: b1d8a2de5f am: ad73674f9d am: b164b09cb1 
Original change: https://android-review.googlesource.com/c/platform/development/+/2129337

Change-Id: I0bb7c20bc59542e915be11bdb3dd73d3acee0849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 17:22:25 +00:00
Matthew Maurer
b164b09cb1 Merge changes I4c3744e0,I91d8de92 am: b1d8a2de5f am: ad73674f9d 
Original change: https://android-review.googlesource.com/c/platform/development/+/2129337

Change-Id: Ia20151ca52b1933a342e8baea9c0a66f4dc02083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:55:33 +00:00
Matthew Maurer
ad73674f9d Merge changes I4c3744e0,I91d8de92 am: b1d8a2de5f 
Original change: https://android-review.googlesource.com/c/platform/development/+/2129337

Change-Id: Ifa740eda5483de4b4a660fa52a8ab3b277b3c9e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 16:27:48 +00:00
Matthew Maurer
b1d8a2de5f Merge changes I4c3744e0,I91d8de92 
* changes:
  c2a: Our cargo works again, re-enable defaulting.
  c2a: Fix rust_version calculation
 2022-08-17 16:08:32 +00:00
Mu-Le Lee
807bfe9ef1 Merge "Change the format of header-abi-diff config from .ini to .json" am: e43c2bc9a7 am: 1997b594d6 am: 2af8de3972 
Original change: https://android-review.googlesource.com/c/platform/development/+/2176545

Change-Id: Icb8d9d4d69ee8d79f6f27f7c241737643c08d5da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 07:24:29 +00:00
Mu-Le Lee
2af8de3972 Merge "Change the format of header-abi-diff config from .ini to .json" am: e43c2bc9a7 am: 1997b594d6 
Original change: https://android-review.googlesource.com/c/platform/development/+/2176545

Change-Id: I6b97bbb31b9171d2b6f1fbc7a4f50c821f042b00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 06:54:26 +00:00
Mu-Le Lee
1997b594d6 Merge "Change the format of header-abi-diff config from .ini to .json" am: e43c2bc9a7 
Original change: https://android-review.googlesource.com/c/platform/development/+/2176545

Change-Id: I41ea447c0c56dbd4ec8123c579fa103f39964dad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 06:21:43 +00:00
Mu-Le Lee
e43c2bc9a7 Merge "Change the format of header-abi-diff config from .ini to .json" 2022-08-17 05:58:15 +00:00
Automerger Merge Worker
7edbd525a5 [automerger skipped] Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: cf3ad91aae -s ours am: 5dfccffb3c -s ours 
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2186582

Change-Id: I786a0bb017b1d4aa3d28b853c3f2651c90a9567d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 00:55:34 +00:00
Xin Li
c18594cce8 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours am: 4392c82f8e -s ours am: 1b2a51e7ff -s ours 
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2186582

Change-Id: I07cc9965afc8a6205c820dbd0e03c8ff7be35391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 00:55:06 +00:00
Automerger Merge Worker
5dfccffb3c Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: cf3ad91aae -s ours 
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2186582

Change-Id: I11c61bc48ec60decaf1b855e609f203873df5e28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 00:29:57 +00:00
Xin Li
1b2a51e7ff [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours am: 4392c82f8e -s ours 
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2186582

Change-Id: I2b5258ea4a20ad271cb1375f861589441363e014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 00:29:30 +00:00
Xin Li
b7c85f9190 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours am: 7f7c44d6ca -s ours am: 1f110f2cf3 -s ours 
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2186582

Change-Id: I215d6820b030632664be6db8585afdb98abe97df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 00:26:18 +00:00
Xin Li
a4dd59c63d [automerger skipped] DO NOT MERGE - Merge Android 13 am: aa167d631e -s ours am: f2ea94b3a9 -s ours am: c01cc4e72e -s ours 
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2186582

Change-Id: Ic1d190f2cae1cd9b9fe9dbbbe4e8d9725498a62d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 00:25:51 +00:00
Xin Li
1f110f2cf3 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours am: 7f7c44d6ca -s ours 
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2186582

Change-Id: I6dccdba8809fa18c842ed89e1dbec9865b021e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-17 00:00:20 +00:00
Xin Li
c01cc4e72e [automerger skipped] DO NOT MERGE - Merge Android 13 am: aa167d631e -s ours am: f2ea94b3a9 -s ours 
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2186582

Change-Id: If81c8b32b8ee865e8f6276e15d5aa91d0ecc66c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 23:59:49 +00:00
Automerger Merge Worker
cf3ad91aae Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master 
* changes:
  [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours
  [automerger skipped] DO NOT MERGE - Merge Android 13 am: aa167d631e -s ours
 2022-08-16 23:43:03 +00:00
Xin Li
4392c82f8e [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours 
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2186582

Change-Id: I131c41a522f76f5e882740a2a2919f0cdc844c95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 23:40:15 +00:00
Xin Li
b6f1bde694 [automerger skipped] DO NOT MERGE - Merge Android 13 am: aa167d631e -s ours 
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2186582

Change-Id: I620e778713628d311f5afc77748b638a9daffe4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 23:39:45 +00:00
Xin Li
7f7c44d6ca [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 4ce806fe1b -s ours 
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2186582

Change-Id: Iae99cc2ad02a8eaf997200f93de1f4525afa2d44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 23:37:51 +00:00
Xin Li
f2ea94b3a9 [automerger skipped] DO NOT MERGE - Merge Android 13 am: aa167d631e -s ours 
am skip reason: Merged-In Ib270c83d4f18dc7e301667733df8952f83581116 with SHA-1 28092bd22e is already in history

Original change: https://android-review.googlesource.com/c/platform/development/+/2186582

Change-Id: I2725c3ee80866631a44553f9859e484509d34033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 23:37:20 +00:00
Xin Li
4ce806fe1b Merge "DO NOT MERGE - Merge Android 13" 2022-08-16 19:08:16 +00:00
Treehugger Robot
d0b00316f7 Merge "Bumping package version number for T. Test: treehugger Bug: 242625850" am: ddbf515da8 am: 39d748b0ae am: ae366e4eb9 
Original change: https://android-review.googlesource.com/c/platform/development/+/2186580

Change-Id: Ifee5a68951200424c8d4a40a3f1ac57ab92d2879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 06:46:47 +00:00
Treehugger Robot
ae366e4eb9 Merge "Bumping package version number for T. Test: treehugger Bug: 242625850" am: ddbf515da8 am: 39d748b0ae 
Original change: https://android-review.googlesource.com/c/platform/development/+/2186580

Change-Id: I11174122c13ac60b2c031d1b13fccda2b0450c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 05:50:20 +00:00
Treehugger Robot
39d748b0ae Merge "Bumping package version number for T. Test: treehugger Bug: 242625850" am: ddbf515da8 
Original change: https://android-review.googlesource.com/c/platform/development/+/2186580

Change-Id: I4fc8a98e2ca40e081cbdd77e43631ce5ea7fe9ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-16 05:04:00 +00:00
Xin Li
aa167d631e DO NOT MERGE - Merge Android 13 
Bug: 242648940
Merged-In: Ib270c83d4f18dc7e301667733df8952f83581116
Change-Id: I196fa21c8487e0f57ab3d8a4761e149fe407f083
 2022-08-15 21:59:27 -07:00
Treehugger Robot
ddbf515da8 Merge "Bumping package version number for T. Test: treehugger Bug: 242625850" 2022-08-16 04:36:55 +00:00
Shaju Mathew
6e77cfb32b Bumping package version number for T. 
Test: treehugger
Bug: 242625850

Signed-off-by: Shaju Mathew <shaju@google.com>
Change-Id: I5f52e907afdbfed6943f97e11c612e1efbd244d1
 2022-08-16 02:57:18 +00:00
Inseob Kim
e9ac1f6f17 Merge "Export vendor.img and ninja analysis results" am: de0317677b am: 34f24fd47e am: 7da36aa8a4 
Original change: https://android-review.googlesource.com/c/platform/development/+/2183577

Change-Id: I8bf6cdd09c271545bf2cc6a1ac90be8af390feed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 05:41:18 +00:00
Inseob Kim
7da36aa8a4 Merge "Export vendor.img and ninja analysis results" am: de0317677b am: 34f24fd47e 
Original change: https://android-review.googlesource.com/c/platform/development/+/2183577

Change-Id: Id769354e5e50f2ed938414ed5e884342bdba2011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 05:24:08 +00:00
Inseob Kim
34f24fd47e Merge "Export vendor.img and ninja analysis results" am: de0317677b 
Original change: https://android-review.googlesource.com/c/platform/development/+/2183577

Change-Id: I4434820f626afe78b56a15d678d16d7bc1c5486f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-12 05:03:53 +00:00
Inseob Kim
de0317677b Merge "Export vendor.img and ninja analysis results" 2022-08-12 04:35:18 +00:00
Inseob Kim
28092bd22e Export vendor.img and ninja analysis results 
Test: manual
Change-Id: Ib270c83d4f18dc7e301667733df8952f83581116
 2022-08-12 10:56:51 +09:00
Matthew Maurer
7f1c02853c Merge "rust: addr3prf: Support COPYING files" am: a2fff95476 am: 5584fd7393 am: 9d224221ac 
Original change: https://android-review.googlesource.com/c/platform/development/+/2182815

Change-Id: Ic289609093e5e3d302cf3fca233f656ff3fd79ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 18:21:15 +00:00
Matthew Maurer
9d224221ac Merge "rust: addr3prf: Support COPYING files" am: a2fff95476 am: 5584fd7393 
Original change: https://android-review.googlesource.com/c/platform/development/+/2182815

Change-Id: I650241724545ea11134a88239691e89f306650bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 17:32:41 +00:00
Matthew Maurer
5584fd7393 Merge "rust: addr3prf: Support COPYING files" am: a2fff95476 
Original change: https://android-review.googlesource.com/c/platform/development/+/2182815

Change-Id: I45d9882d7382e13ec7d6838b7b878aed3efa2945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-11 17:06:42 +00:00
Matthew Maurer
a2fff95476 Merge "rust: addr3prf: Support COPYING files" 2022-08-11 16:52:28 +00:00
Mu-Le Lee
c2ebbbfec5 Change the format of header-abi-diff config from .ini to .json 
Since Cross-Version ABI Check is introduced, the flags could be
different when diffing with previous or current dumps. The structure and
format of the newly proposed config are changed so users can configure
flags for different diff targets. This CL changes the config format from
.ini to .json with the same features the format of the json is described
in go/cross-version-abi-diff-configuration.

Test: preform abi diff with config.json
Bug: 239792343
Change-Id: I731bafbfdacd2a780c5f7a27997893cecb2eb1f3
 2022-08-11 06:35:33 +00:00
Matthew Maurer
51ec016f76 rust: addr3prf: Support COPYING files 
Previously, we only looked for LICENSE* files. This adds support for
detecting COPYING* files as an alternate representation of the license.

Bug: 234563254
Test: get_rust_pkg.py -add3prf quiche
Change-Id: Ic04ef42f349879be18a4307bd863288dfa81b5fc
 2022-08-10 15:29:24 -07:00
Inseob Kim
32cc701518 Merge "Add multitree sample build script" am: ea3c580c00 am: 99b62ffe4e am: d2c7c791b3 
Original change: https://android-review.googlesource.com/c/platform/development/+/2179374

Change-Id: I7532518ebec8c8efb95788333db96af4bd9af189
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 07:32:52 +00:00
Inseob Kim
d2c7c791b3 Merge "Add multitree sample build script" am: ea3c580c00 am: 99b62ffe4e 
Original change: https://android-review.googlesource.com/c/platform/development/+/2179374

Change-Id: I5ecd9ca7059936d9eff95da6d0839d5ee3ab9ef4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 07:14:16 +00:00
Inseob Kim
99b62ffe4e Merge "Add multitree sample build script" am: ea3c580c00 
Original change: https://android-review.googlesource.com/c/platform/development/+/2179374

Change-Id: Id12670ebc9c220d5cb78e9b33fd348fe5e618982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-10 06:34:40 +00:00
Inseob Kim
ea3c580c00 Merge "Add multitree sample build script" 2022-08-10 06:14:39 +00:00
Inseob Kim
2a458f6d14 Add multitree sample build script 
Bug: 233327677
Test: manual
Change-Id: Ia83982911606a8cd8fb43d3bce211d5450d2997b
 2022-08-10 11:33:26 +09:00
Treehugger Robot
eb009ffec1 Merge "Fix the incorrect prebuilts-info in aosp-master-boot" am: 9428c27824 am: fc8e1abc67 am: 94092b5c2a 
Original change: https://android-review.googlesource.com/c/platform/development/+/2168326

Change-Id: Ia02c8aa3bf7a5bd4cae3917f877cbe4266800a00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 08:51:46 +00:00
Treehugger Robot
94092b5c2a Merge "Fix the incorrect prebuilts-info in aosp-master-boot" am: 9428c27824 am: fc8e1abc67 
Original change: https://android-review.googlesource.com/c/platform/development/+/2168326

Change-Id: Ibba4c0028ffe5732b2f038f891fcee9c038e4745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 08:27:53 +00:00
Treehugger Robot
fc8e1abc67 Merge "Fix the incorrect prebuilts-info in aosp-master-boot" am: 9428c27824 
Original change: https://android-review.googlesource.com/c/platform/development/+/2168326

Change-Id: Ida5e332f83e60d6f3c427e4c85718a031f2b76b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 08:08:07 +00:00
Treehugger Robot
9428c27824 Merge "Fix the incorrect prebuilts-info in aosp-master-boot" 2022-08-02 07:44:25 +00:00
Howard Chen
8013679744 Fix the incorrect prebuilts-info in aosp-master-boot 
Bug: 241050793
Test: \
    development/gsi/build_with_kernel/repack_kernels.sh aarch64 \
    development/gsi/build_with_kernel/update_kernel_prebuilts_510_arm64.sh \
    development/gsi/build_with_kernel/update_kernel_prebuilts_515_arm64.sh \
    build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=gki_arm64 TARGET_BUILD_VARIANT=user DIST_DIR=%dist_dir% droid dist \
    development/gsi/build_with_kernel/kernel_info_to_dist.sh aarch64

Change-Id: I6ee2e6a5dfbc4e3105bfcdf7191dd306edb59b4c
 2022-08-02 14:28:18 +08:00
Treehugger Robot
8bbdf758b2 Merge "Fix license_collector" am: e32fd5baaa am: 3d35ced879 am: 7012f00472 
Original change: https://android-review.googlesource.com/c/platform/development/+/2168323

Change-Id: Ic36c2eb270ea47c35b54d17739c71218f7dd5282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-29 09:07:41 +00:00