StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,630 Commits 1 Branch 0 Tags
c51a099e018d03ab35d40b689bf33a8fa0ec5d9e
Commit Graph

8487 Commits

Author SHA1 Message Date
Treehugger Robot
cdfd8e3f4f Merge "aconfig: change java flag method name to camelCase" am: 59d662524c am: bec4ce710f am: 9c7c5dabaa 
Original change: https://android-review.googlesource.com/c/platform/build/+/2626776

Change-Id: I5158885f1f8dc25a166c4f06ced7940663fe0042
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 00:09:54 +00:00
Treehugger Robot
bec4ce710f Merge "aconfig: change java flag method name to camelCase" am: 59d662524c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2626776

Change-Id: I7d5747d6a4a33f6b49e2c13f06bf539c71c324ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 22:41:03 +00:00
Alex Buynytskyy
bce1a51df8 Use patch instead of git apply. 
Bug: 281682520
Test: run locally
Change-Id: Ia84055b7a9074836c6d7b3039ba980e39043a41e
 2023-06-16 20:23:36 +00:00
Zhi Dou
af81e20653 aconfig: change java flag method name to camelCase 
Before java code will directly use the flag name as the method name.
This change adds funciton to try the best to convert flag name to
camelCase, and then use the camelCase string as the method name in the
generated code.

Bug: 279483816
Test: atest aconfig.test aconfig.test.java
Change-Id: I45fc6df46c9d535cd38a657a41313202f9b660af
 2023-06-16 12:40:40 +00:00
Jooyung Han
db9d2f09b7 Merge "Remove --blkid_path argument" am: e4635b3e04 am: 4941f6fd47 am: da705680d7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2624574

Change-Id: Idebb626816eebee2f789ec7d372a0a016d192ea9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 08:36:48 +00:00
Jooyung Han
4941f6fd47 Merge "Remove --blkid_path argument" am: e4635b3e04 
Original change: https://android-review.googlesource.com/c/platform/build/+/2624574

Change-Id: Icb064093d587479713e7da5bd670d4cb36f977a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 07:30:28 +00:00
Jooyung Han
e4635b3e04 Merge "Remove --blkid_path argument" 2023-06-16 06:48:57 +00:00
Bob Badour
a0b53ceac2 Fix godoc typos. 
Methods got renamed, but the godoc didn't.

Test: m droid dist
Change-Id: Ia1181a2c7a876e54b8cd26ba1c91ce731ba8ac96
 2023-06-15 16:26:21 -07:00
Treehugger Robot
d9f460f252 Merge changes I9c1a5346,I0a9d2c58 am: 5c73eb33db am: 8ac8ce2b16 am: 58316e6b49 
Original change: https://android-review.googlesource.com/c/platform/build/+/2627031

Change-Id: Ib418962a6efe79c672e571db450d8961532e065c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 18:28:23 +00:00
Treehugger Robot
8ac8ce2b16 Merge changes I9c1a5346,I0a9d2c58 am: 5c73eb33db 
Original change: https://android-review.googlesource.com/c/platform/build/+/2627031

Change-Id: Ied665b5cbd2d1b207c184458eef0ef49259df129
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 16:36:23 +00:00
Mårten Kongstad
0cd8092376 aconfig: fix incorrect source path in test cache 
Bug: 283910447
Test: atest aconfig.test
Change-Id: I9bc34e838a0945891f866e9788bcf9f4f6c23d3b
 2023-06-15 11:43:33 +02:00
Mårten Kongstad
f94225266f aconfig: reduce number of #[cfg(feature = "cargo")] uses 
Group statements with identical #[cfg(feature = "cargo")] attributes in
the same block. This reduces repetition and makes the code easier to
read and less error prone.

Bug: 284779868
Test: atest aconfig.test
Change-Id: Iebdcd20e7cd22cb641424a1af594f5c9ac57b623
 2023-06-15 09:28:49 +02:00
Kelvin Zhang
38d0c373ac Fix python3.11's support for zip64 
Bug: 283033491
Test: check_target_files_signatures -v -l
Change-Id: I9c1a5346e3a5f3920242dc9a5268d999f50a4937
 2023-06-14 12:54:57 -07:00
Kelvin Zhang
b789e84499 Search for partition maps in IMAGES dir as well 
Partition images are allowed to be in either IMAGES/ or RADIO/ dir of a
target_files zip, so when searching for .map files we should look in
both dirs.

Test: th
Bug: 227848550
Change-Id: I0a9d2c582d8f5d570237434902fac012513c9aad
 2023-06-14 10:01:21 -07:00
Zhi Dou
aab20107a3 Merge "aconfig: Java codegen iteration 1" am: 06377d79ab am: 678166cbdb am: 1024339fd0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2619534

Change-Id: I68a3890cd26caad4f25ce6fa91b9c6a59520c40a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 15:31:47 +00:00
Bob Badour
5a3e4a439a Fix usage message. 
Incorrectly had an old dumpresolutions usage.

Test: m droid dist

Change-Id: Icf1a8ef99978c1287d88aae953e4a23f310f900a
 2023-06-14 08:05:31 -07:00
Zhi Dou
678166cbdb Merge "aconfig: Java codegen iteration 1" am: 06377d79ab 
Original change: https://android-review.googlesource.com/c/platform/build/+/2619534

Change-Id: I3ef56bcda7625dcaf70abb937b1b6503b4e7333d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 14:02:19 +00:00
Zhi Dou
06377d79ab Merge "aconfig: Java codegen iteration 1" 2023-06-14 13:21:16 +00:00
Jooyung Han
629490292a Remove --blkid_path argument 
deapexer doesn't need it.

Bug: 279858383
Test: presubmit
Change-Id: If0ec42b5edd4642f07c96ba641030c4dd6fb4660
 2023-06-14 15:16:34 +09:00
Treehugger Robot
a114c493ca Merge "aconfig: reject consecutive underscores in identifiers" am: c01b9a2877 am: e6d7954914 am: 71b0098f49 
Original change: https://android-review.googlesource.com/c/platform/build/+/2624469

Change-Id: Iaed8a96cf23e18133ec091accb75eb7026c938af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 00:08:45 +00:00
Treehugger Robot
e6d7954914 Merge "aconfig: reject consecutive underscores in identifiers" am: c01b9a2877 
Original change: https://android-review.googlesource.com/c/platform/build/+/2624469

Change-Id: I08a32db9a755df12a8a6744a8843dacc9dc74607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 22:40:50 +00:00
Zhi Dou
4655c967e1 aconfig: Java codegen iteration 1 
This change includes
    - refactor generated java code to generate
        - Flags.java to support the static API
	- FeatureFlagsImpl.java to support injection API
	- FeatureFlags.java interface

Bug: 279483816
Test: atest aconfig.test aconfig.test.java
Change-Id: If0d4baf317b9174635cd0fff3832ab7091ee52ed
 2023-06-13 14:45:53 +00:00
Mårten Kongstad
d18c978f31 aconfig: reject consecutive underscores in identifiers 
The Java codegen may translate flag names (snake_case) to Java
camelCase, dropping the underscores. The flags a_b and a__b will
translate to the same camelCase form, which is ambiguous.

Circumvent this problem by disallowing consecutive underscores in flag
names, flag namespaces, and packages.

Bug: 284252015
Test: atest aconfig.test
Change-Id: I2586a38160723c06265a140193da8178655553e4
 2023-06-13 13:30:58 +02:00
Dennis Shen
f2e371c32f Merge "aconfig: update cpp codegen to use static methods" am: f1cd83bece am: d57d4fed31 am: c9156e607b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2620871

Change-Id: I7b7f141892ed2aa200ac87b3534dbcc771e4586c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 15:11:31 +00:00
Dennis Shen
d57d4fed31 Merge "aconfig: update cpp codegen to use static methods" am: f1cd83bece 
Original change: https://android-review.googlesource.com/c/platform/build/+/2620871

Change-Id: I614fac778dd96a3da711ea9cbd78ee8656725cea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 13:43:38 +00:00
Dennis Shen
f1cd83bece Merge "aconfig: update cpp codegen to use static methods" 2023-06-12 12:57:57 +00:00
Dennis Shen
4f78f10015 aconfig: update cpp codegen to use static methods 
Update c++ codegen to static methods interface.

Bug: b/279483801
Test: atest aconfig.test
Change-Id: I78da3bbca6240bee660c692807930d00f2242b0a
 2023-06-12 12:57:38 +00:00
Joe Onorato
0bbfa29e0c Merge "Define release flags in starlark instead of make" am: 593bef7150 am: 11a113676a am: 0cd220797b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617915

Change-Id: Iea431abef7ea5a3704eab684b056ed9cf303a702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 05:13:42 +00:00
Joe Onorato
11a113676a Merge "Define release flags in starlark instead of make" am: 593bef7150 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617915

Change-Id: I97dc13cec1e261baa7efe56d5a8b880f262956a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 03:49:13 +00:00
Joe Onorato
593bef7150 Merge "Define release flags in starlark instead of make" 2023-06-10 03:21:22 +00:00
Joe Onorato
d47d8e8636 Merge "Fix build breakage" am: ed1e3b50f3 am: d1ac3e6971 am: d433bbae25 
Original change: https://android-review.googlesource.com/c/platform/build/+/2618395

Change-Id: I05f346c5292e0c319ea92c5f6c7d9b879de5aa0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 23:04:37 +00:00
Joe Onorato
d1ac3e6971 Merge "Fix build breakage" am: ed1e3b50f3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2618395

Change-Id: I7db1ffc93f713da34a301da04418b7b5a6afd86e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 21:34:34 +00:00
Treehugger Robot
04d9f1e0de Merge "Supply apex_info.pb as parameter to delta_generator if file exists" am: df2af7c840 am: b2dec242f8 am: 8fdc4db774 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617618

Change-Id: I4c142f415bbce52f08ab2c6051420ea96356da2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 21:33:07 +00:00
Joe Onorato
ed1e3b50f3 Merge "Fix build breakage" 2023-06-09 20:57:36 +00:00
Joe Onorato
8b51859317 Fix build breakage 
error: build/make/tools/aconfig/Android.bp:69:1: module "aconfig.test.java" variant "android_common": path dependency ":aconfig.test.flags{.srcjar}": unsupported device_config_definitions module reference tag ".srcjar"

Test: m aconfig.test.java
Change-Id: I3df980b06796c90dafee3940fe52809748305950
 2023-06-09 13:39:41 -07:00
Cole Faust
386b3746ce Define release flags in starlark instead of make 
So that we have a more restricted enviornment for this new configuration
axis that can also be imported into other tools more easily.

Test: Manually (this time also tested setting OUT_DIR outside of the tree)
Change-Id: I01d90e06e45cba756156af16f63e04f575877263
 2023-06-09 13:10:05 -07:00
Treehugger Robot
b2dec242f8 Merge "Supply apex_info.pb as parameter to delta_generator if file exists" am: df2af7c840 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617618

Change-Id: I9751859fb7114e3cc216860bb2cb951fcefe74fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 20:04:17 +00:00
Treehugger Robot
df2af7c840 Merge "Supply apex_info.pb as parameter to delta_generator if file exists" 2023-06-09 19:23:31 +00:00
Zhi Dou
f72740212f Merge "aconfig: add Java integration tests" am: 1120cb8aa4 am: e6bcd369a9 am: b6108695f0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2607427

Change-Id: I9b91945b743d13363c20097dff41b04e4a1fbb7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 15:54:06 +00:00
Zhi Dou
e6bcd369a9 Merge "aconfig: add Java integration tests" am: 1120cb8aa4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2607427

Change-Id: I8f1a4d78fdcc297f719e10b9364bb16d266727fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 14:21:44 +00:00
Håkan Kvist
ddb968dce0 Supply apex_info.pb as parameter to delta_generator if file exists 
Supply generator with parameter --apex_info_file=META/apex_info.pb
if the file exists.

This ensures that apex_info is included in payload header.

This is identical to the behaviour of brillo_update_payload
which is not being used since:
Invoke delta_generator directly
fcd731e3d6

Issue: 286253576
Test: Manual, confirm that apex_info is included in payload header
Change-Id: Ic096c5f8966beec8686f918aba462c955290a6c5
 2023-06-09 12:46:58 +02:00
Mårten Kongstad
9c59c31499 aconfig: add Java integration tests 
Add integration tests for Java. This test setup verifies that

  - the build system calls aconfig to generate a Java library
  - the Java test compiles against the auto-generated library
  - the auto-generated code returns expected values

Similar integration tests for C++ and Rust will be added in follow-up
CLs.

Note: the build does not currently support specifying that
tests/*.values should be applied, so the test flags will all be assigned
the defaults. A later CL will fix this.

Bug: b/283911467
Test: atest aconfig.test aconfig.test.java
Change-Id: Ia365e209261f4935a23e2dac9ef0ab5b60f76e52
 2023-06-09 09:59:21 +02:00
Treehugger Robot
ecc527eb52 Merge "fixup! Allow ota_from_target_file to work entirely on directories" am: d60dbf9773 am: 980458ae17 am: 08fc8461a1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617616

Change-Id: I77011348d3b32a35217b804feb9f4ea38fcffea9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 00:46:53 +00:00
Treehugger Robot
980458ae17 Merge "fixup! Allow ota_from_target_file to work entirely on directories" am: d60dbf9773 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617616

Change-Id: I093dccc54174e68f282d9a0f79e6a5ba7f2555ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 23:08:30 +00:00
Treehugger Robot
d60dbf9773 Merge "fixup! Allow ota_from_target_file to work entirely on directories" 2023-06-08 22:20:30 +00:00
Mårten Kongstad
35f8c6b0a1 Merge changes from topic "aconfig-rename-namespace-to-package" am: ec5da68dbd am: 5c4398ba52 am: 7446093e9b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617393

Change-Id: Ia6cc72cf50115bac6c5816cd786dde5156e7ba43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 17:39:13 +00:00
Mårten Kongstad
5c4398ba52 Merge changes from topic "aconfig-rename-namespace-to-package" am: ec5da68dbd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617393

Change-Id: Ia24fee81a09ad3dd8bbecabfab38359b1d6cceb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 16:13:24 +00:00
Mårten Kongstad
ec5da68dbd Merge changes from topic "aconfig-rename-namespace-to-package" 
* changes:
  aconfig: include namespace in create-device-config-defaults
  aconfig: improve code diffs in tests
  aconfig: add namespace field to flag_declaration and parsed_flag
  aconfig: allow dots in package fields
  aconfig: rename namespace -> package
 2023-06-08 15:12:10 +00:00
Håkan Kvist
b8982fc538 fixup! Allow ota_from_target_file to work entirely on directories 
The following log message would always be shown:
WARNING : Cannot find care map file in target_file package

Break out of the care map copying loop as soon a file has been
copied. This ensures that else statement is only executed if no
care map file exists.

Test: Manual. Run ota_from_target_files with target-zip with and
    without care map files.
Change-Id: Ia196aa182ed81f21424317a7005f5634866b4b99
 2023-06-08 15:17:57 +02:00
Mårten Kongstad
202102f7be aconfig: include namespace in create-device-config-defaults 
Update the output format of create-device-config-defaults to include the
flag's namespace. Also change the delimiters. The new format is

  <namespace>:<package>.<flag-name>=[enabled|disabled|

Bug: 285468565
Test: atest aconfig.test
Change-Id: I9b4ca1611cca8528dc341fc12812b614c86f6c08
 2023-06-08 11:28:09 +02:00