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

33963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hsin-Yi Chen
ffbbed4edf Merge "Add README about opt-in ABI dumps" am: 934663b2f0 
Original change: https://android-review.googlesource.com/c/platform/development/+/2537631

Change-Id: Ic7b9b3446c7290f12a565c30f3cfb1c17c7ca31a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 11:09:00 +00:00
Hsin-Yi Chen
934663b2f0 Merge "Add README about opt-in ABI dumps" 2023-04-25 10:24:17 +00:00
Xin Li
9e96ca15ed Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master 2023-04-21 17:40:07 +00:00
Shaju Mathew
43f211f029 Merge "Package version bump for U." am: 93396b2b35 
Original change: https://android-review.googlesource.com/c/platform/development/+/2551670

Change-Id: Ic67c0bd6850cb1f361fb3a7789e908515601b9e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 20:16:12 +00:00
Shaju Mathew
93396b2b35 Merge "Package version bump for U." 2023-04-20 19:36:53 +00:00
Shaju Mathew
faf2b3d078 Package version bump for U. 
Test: treehugger

Bug: 279028960
Change-Id: Ie0553922f6c67bd9c15cb375ba335b646089a4ad
 2023-04-20 16:44:06 +00:00
Inseob Kim
520456adc1 Merge "Add min_sdk_version prop to snapshots" am: 02b3862cda 
Original change: https://android-review.googlesource.com/c/platform/development/+/2542490

Change-Id: I277302b4c37c9a0d6264629318df12a55c3955d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 08:24:24 +00:00
Inseob Kim
02b3862cda Merge "Add min_sdk_version prop to snapshots" 2023-04-20 07:36:58 +00:00
Junghoon Jang
055ae89408 Merge "repo-pull: Introduce --ignore-unknown-changes arg" am: e4f118be6f 
Original change: https://android-review.googlesource.com/c/platform/development/+/2544230

Change-Id: I1a893e625817888e3c576de68c509387d3c47cb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 11:38:51 +00:00
Junghoon Jang
e4f118be6f Merge "repo-pull: Introduce --ignore-unknown-changes arg" 2023-04-19 10:55:11 +00:00
Xin Li
fa48b40c3b Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 
Bug: 275386652
Merged-In: I7aaaef7eb2ae6166bc914db81ffa1f557d4d62e1
Change-Id: I948361782cc4d58a5c2b7528bfadfa0e5d97dcd7
 2023-04-18 16:31:54 -07:00
Junghoon Jang
ac6afae3d6 repo-pull: Introduce --ignore-unknown-changes arg 
In the case of pulling changes of a topic which is shared by multiple
repos, if the target source tree doesn't contain all of those repos,
the script will fail to apply changes.

Introduce a new argument, --ignore-unknown-changes, which ignores
changes whose repo is not in the manifest.xml.

Test: Pulling changes of a topic which is shared by multiple repos to
  the source tree which contains part of those repos was done
  successfully with the newly introduce argument.
Change-Id: Ie999121415bc1888b714d023ca251ad89701df11
Signed-off-by: Junghoon Jang <junghoonjang@google.com>
 2023-04-18 15:52:07 +00:00
Inseob Kim
46628fff98 Add min_sdk_version prop to snapshots 
Bug: 277403349
Test: build vndk/vendor snapshot and build
Change-Id: I460c69cbc5820132690c9d3fb325c5eb504f5366
 2023-04-18 16:50:20 +09:00
Treehugger Robot
b7e7077c5e Merge "VNDK snapshot tool generates license information from json" am: c973f68913 
Original change: https://android-review.googlesource.com/c/platform/development/+/2539710

Change-Id: I305a66da391ecd89d16b32edc54446ff8a5d140e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-18 06:10:03 +00:00
Treehugger Robot
c973f68913 Merge "VNDK snapshot tool generates license information from json" 2023-04-18 05:33:10 +00:00
Justin Yun
9e48f54e06 VNDK snapshot tool generates license information from json 
VNDK snapshot zip file includes license information in json files.
Instead of parsing the license text files, read the information from
the json files.
VNDK snapshot v33 and older do not include this information and must
parse the license text files as before.

Bug: 277317599
Test: generate snapshots with/without json information && m nothing
Change-Id: Ibdbc571c9effe6c17f5d82a7a0894ad2d800711f
 2023-04-17 15:47:24 +09:00
Junghoon Jang
8e297e0ad6 Merge changes Iff3cdebe,I9d1add4f am: 40e23904e3 
Original change: https://android-review.googlesource.com/c/platform/development/+/2530760

Change-Id: I22dea55d2aef31490cf57801f0d88cce0ef98082
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 05:44:09 +00:00
Junghoon Jang
40e23904e3 Merge changes Iff3cdebe,I9d1add4f 
* changes:
  repo-pull: Introduce --current-branch argument
  repo-pull: Consider branch of repo
 2023-04-17 05:15:57 +00:00
Hsin-Yi Chen
ad092ec244 Merge "Fix the internal type of enum values" am: 74e23a1ec1 
Original change: https://android-review.googlesource.com/c/platform/development/+/2530761

Change-Id: I6b5df899cf359e4898bf87d583012898f9832766
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 03:12:21 +00:00
Hsin-Yi Chen
74e23a1ec1 Merge "Fix the internal type of enum values" 2023-04-17 02:37:43 +00:00
Junghoon Jang
108c36c52b repo-pull: Introduce --current-branch argument 
To make the script can be used from automatic scripts, introduce
`--current-branch` argument which allows pulling commits to the current
branch without creating a local branch. It will skip the prompt which
asking about the creation of a local branch.

Test: With --current-branch argument, the script doesn't ask setting
  local branch name.
Change-Id: Iff3cdebe6338bb2be738e60047d5c4dd81cde4f0
Signed-off-by: Junghoon Jang <junghoonjang@google.com>
 2023-04-14 12:25:29 +00:00
Junghoon Jang
172ccfe52d repo-pull: Consider branch of repo 
In the case of one source tree containing multiple repos with the same
project, but different branches, the script won't sync them properly.
To fix it, make it consider the branch along with the project.

Test: Tested syncing well in the directory which contains multiple repos
  with the same project, but different branches.
Change-Id: I9d1add4ffe85f80f8f9d6a3ae2c046473d7c4631
Signed-off-by: Junghoon Jang <junghoonjang@google.com>
 2023-04-14 12:24:51 +00:00
Hsin-Yi Chen
35fabff46a Add README about opt-in ABI dumps 
- Add the commands to write Android.bp, create reference dumps, and
  find the generated dumps.
- Remove "persistent-" from the repo command as it's internal only.

Test: None
Bug: 227282691
Change-Id: I07dc947c0436e2a0e7e5b3a4f812800bd7df2720
 2023-04-14 19:31:49 +08:00
Hsin-Yi Chen
62081d11b4 Fix the internal type of enum values 
EnumFieldIR has member functions that determine whether the enum value
is signed. The JSON dumper uses the functions to distinguish between
negative values and values >= (1 << 63).

Bug: 277299761
Test: ./test.py
Change-Id: If5f3a33aaf5f53f39019fdd10dde366d48a50340
 2023-04-12 11:37:10 +00:00
Treehugger Robot
cf2761f253 Merge changes I3e156afa,Id7e4f2eb am: 116fa3048f am: 864082db3d 
Original change: https://android-review.googlesource.com/c/platform/development/+/2513461

Change-Id: I2eb813107b7d5d0ce105e8b6909d32aa6062da39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:26:11 +00:00
Treehugger Robot
17378f0996 Merge "Utilize from-text stub module in build" am: 43ff63a864 am: 210fc28fcf 
Original change: https://android-review.googlesource.com/c/platform/development/+/2465411

Change-Id: Ic18988828542a6f79213f49b7b16ff51f477aab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:17:14 +00:00
Treehugger Robot
864082db3d Merge changes I3e156afa,Id7e4f2eb am: 116fa3048f 
Original change: https://android-review.googlesource.com/c/platform/development/+/2513461

Change-Id: I720e1e647d3d4f1064f3759bafe7ebb8deb57ecc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:18:50 +00:00
Treehugger Robot
210fc28fcf Merge "Utilize from-text stub module in build" am: 43ff63a864 
Original change: https://android-review.googlesource.com/c/platform/development/+/2465411

Change-Id: I487653a3dc12e05b3b23bedc4187da765d4c9dba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:15:28 +00:00
Treehugger Robot
116fa3048f Merge changes I3e156afa,Id7e4f2eb 
* changes:
  cargo_embargo: detect and ignore harness-less tests
  cargo_embargo: use enum for crate type
 2023-03-29 23:55:07 +00:00
Frederick Mayle
5a6dbaae7a cargo_embargo: detect and ignore harness-less tests 
These currently cause cargo_embargo to fail. We should support them
eventually, but for now we'll ignore them to unblock crosvm merges.

Test: external/crosvm/android-merge-2-cargo-embargo.sh
Bug: 275386231
Change-Id: I3e156afa5672ddd6257c7caabd05346e060448fb
 2023-03-29 15:25:57 -07:00
Frederick Mayle
04a1650a5f cargo_embargo: use enum for crate type 
No behavior change intended.

This will make a following CL easier.

Test: external/crosvm/android-merge-2-cargo-embargo.sh
Bug: 275386231
Change-Id: Id7e4f2eb3f25fa12d867852a0ec95ce443949257
 2023-03-29 15:24:21 -07:00
Treehugger Robot
43ff63a864 Merge "Utilize from-text stub module in build" 2023-03-29 18:28:30 +00:00
Jihoon Kang
0ae8fe1032 Utilize from-text stub module in build 
Replace `android_stubs_current` with `android_from_text_stubs_current`,
a java_api_library module that creates from-text stubs. This feature is
hidden behind a flag `--build-from-text-stub`, which sets the env var
`ANDROID_PUBLIC_STUBS` as `android_from_text_stubs_current`.

Test: m --build-from-text-stub
Bug: 271154441
Change-Id: I06be32d9b7b9a54c0384010457406cabfff98c61
 2023-03-27 18:04:34 +00:00
Yi Kong
5ecdc53284 Merge "Revert^2 "Update clang version to clang-r487747"" am: 1784c71446 am: b8fa3fbd1a 
Original change: https://android-review.googlesource.com/c/platform/development/+/2469787

Change-Id: I40244c03604708bf3854e5ee12d8fa7b2a04f92a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 14:11:51 +00:00
Yi Kong
b8fa3fbd1a Merge "Revert^2 "Update clang version to clang-r487747"" am: 1784c71446 
Original change: https://android-review.googlesource.com/c/platform/development/+/2469787

Change-Id: I5fa2b0752799941aeb0c9fc790ab86e4eeede110
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 13:44:53 +00:00
Yi Kong
1784c71446 Merge "Revert^2 "Update clang version to clang-r487747"" 2023-03-24 13:19:52 +00:00
Kiyoung Kim
cd066653b8 Merge "Create a new build script for builds using SSI artifact" am: 383ddd8fe7 am: 0b853241ed 
Original change: https://android-review.googlesource.com/c/platform/development/+/2505078

Change-Id: I5c769ef6617cbbc76cbf8f334b28f89cc05f91c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 08:23:08 +00:00
Kiyoung Kim
0b853241ed Merge "Create a new build script for builds using SSI artifact" am: 383ddd8fe7 
Original change: https://android-review.googlesource.com/c/platform/development/+/2505078

Change-Id: I96598fa70db2874fae5c3612b2464f39edfb4360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 07:46:26 +00:00
Kiyoung Kim
383ddd8fe7 Merge "Create a new build script for builds using SSI artifact" 2023-03-23 07:08:50 +00:00
Kiyoung Kim
c981a31234 Create a new build script for builds using SSI artifact 
Build using SSI artifact from the chained build may require extra
arguments from the build. This new script will handle all required
arguments with those new build targets.

Bug: 269977324
Test: N/A
Change-Id: Ia7b1f3c838433d4d51a98be875ac32da88ccbb79
 2023-03-23 14:53:25 +09:00
Treehugger Robot
267458fb34 Merge "Remove AndroidBeamDemo from samples" am: a7ade46095 am: d87ab4e5b5 
Original change: https://android-review.googlesource.com/c/platform/development/+/2500844

Change-Id: Ib4f74989900ba858553fa6c11a41e667645babe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 04:24:48 +00:00
Treehugger Robot
d87ab4e5b5 Merge "Remove AndroidBeamDemo from samples" am: a7ade46095 
Original change: https://android-review.googlesource.com/c/platform/development/+/2500844

Change-Id: I7b9809fc065340851ec2229e1ae243f3ccf807ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 03:47:36 +00:00
Treehugger Robot
a7ade46095 Merge "Remove AndroidBeamDemo from samples" 2023-03-22 02:54:26 +00:00
Henri Chataing
8a56e6ca8f Remove AndroidBeamDemo from samples 
Bug: 265394596
Test: m sdk
Change-Id: I54898705900f73c55d9a2eb3ee1372f510b15fe2
Merged-In: I54898705900f73c55d9a2eb3ee1372f510b15fe2
(cherry picked from commit e1f18b0234)
 2023-03-22 01:59:29 +00:00
Henri Chataing
51e697ec75 Merge "Revert^2 "Remove samples for deprecated Android Beam API"" am: c01e15bdcb am: c4fc02d6bc 
Original change: https://android-review.googlesource.com/c/platform/development/+/2476066

Change-Id: Ib234d5dd4a44ce1909f868d116a5dc501c83a78d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 01:39:26 +00:00
Henri Chataing
c4fc02d6bc Merge "Revert^2 "Remove samples for deprecated Android Beam API"" am: c01e15bdcb 
Original change: https://android-review.googlesource.com/c/platform/development/+/2476066

Change-Id: I96831861030227acdd6310dc5f531ac56a96f5ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 01:05:23 +00:00
Henri Chataing
c01e15bdcb Merge "Revert^2 "Remove samples for deprecated Android Beam API"" 2023-03-22 00:26:49 +00:00
Stephen Hines
0a9432abbb Merge "Remove unused variables" am: edab2ac359 am: 1f481b6f2f 
Original change: https://android-review.googlesource.com/c/platform/development/+/2495416

Change-Id: Icc8ecf904d0eb5f079bce9ccf6a8033933ee9429
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 18:47:32 +00:00
Stephen Hines
1f481b6f2f Merge "Remove unused variables" am: edab2ac359 
Original change: https://android-review.googlesource.com/c/platform/development/+/2495416

Change-Id: Ifa52f306c56c5bcba4ccaddad4a17550bce7ce93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 18:06:12 +00:00
Stephen Hines
edab2ac359 Merge "Remove unused variables" 2023-03-21 16:42:10 +00:00