Commit Graph

55547 Commits

Author SHA1 Message Date
Bowgo Tsai 57f1d98a67 Moving "persist.traced.enable" to /product/build.prop
This property has a stable API so it can be moved to /product
partition. The interface between /product and /system should be
stable, but that between /system and /system_ext need not.

https://android-review.googlesource.com/c/platform/system/libsysprop/+/952375

Bug: 140788609
Test: build and checks /product/build.prop
Change-Id: I3545b22af9aaf4d7f51e88e626e73ac75ded78fc
2019-09-12 17:56:06 +08:00
Tianjie Xu 1c8080098a Remove vendor & product in secondary payload
We used to carry the full OTA for vendor and product partitions when
generating the secondary payload. Since they are not actually used, we
can remove them to reduce the size of factory OTA packages. For example,
the size for a sargo package reduces from 454M to 283M after the change.

Bug: 140771390
Test: generate and apply a second payload on Pixel
Change-Id: I091dc07db8c345b182d9f5dd8d48f5c209245641
2019-09-11 15:23:41 -07:00
TreeHugger Robot 8806061821 Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master 2019-09-11 20:31:35 +00:00
Chen Xu 675b92638d prepare cellbroadcastreceiver to be a mainline module
1. prepare two build targets one for updatable module another
for the legacy platform module with diferent config
2. a new cellbroadcastpermissionconfig module to expose
a signature permission.
3. by default, the build include the legacy version.
Later we will switch to the updatable module after more validation
e.g, usre data migration due to uid change
4. for go devies, always include the platform cellbroadcast to
to avoid creating new process

Bug: 135956699
Test: unit test and test app
Change-Id: I4d757e27b1e36fbf4890d08afbd45a141bccfc7c
Merged-In: I4d757e27b1e36fbf4890d08afbd45a141bccfc7c
2019-09-11 13:13:05 -07:00
Colin Cross 3c562fa09d Merge changes from topic "protobuf-3.9.1"
am: 64c50b353e

Change-Id: I8659fc88588c6e4e1ebab5e363fa3300b9a4c666
2019-09-11 11:16:22 -07:00
Colin Cross 64c50b353e Merge changes from topic "protobuf-3.9.1"
* changes:
  Keep proguard fields for lite runtime
  Install vendorcompat verison of protobuf
  Make javanano a plugin
2019-09-11 18:00:16 +00:00
Tom Cherry 86423cc8e9 Merge "fs_config: Fix generation for devices without vendor partition"
am: 00a086ccc8

Change-Id: Ie2c15635f74c9c84aebba42525e3c3328895f96b
2019-09-11 08:33:45 -07:00
Tom Cherry 00a086ccc8 Merge "fs_config: Fix generation for devices without vendor partition" 2019-09-11 15:10:56 +00:00
Bowgo Tsai 4dc7d76c83 Merge "Moving GSI-specific properties to /system_ext"
am: f558b46466

Change-Id: Ic6efd929d0a729209ddc1b0bade209d35d11626e
2019-09-11 00:29:38 -07:00
Treehugger Robot f558b46466 Merge "Moving GSI-specific properties to /system_ext" 2019-09-11 07:03:05 +00:00
Bowgo Tsai 06533fef4a Moving GSI-specific properties to /system_ext
We're now adding a core CSI system.img that is common across different
targets. So GSI-specific things should be moved to /system_ext.

Also renaming various generic*/system.prop to generic*/system_ext.prop.
This is to put the customization into /system_ext/build.prop instead of
/system/build.prop.

Bug: 137711197
Test: boot a GSI on crosshatch, and checks the value of those properties
Change-Id: Id344124280d5f4a6c10d390a9e8a4a50cc7f28fb
2019-09-10 21:55:32 +08:00
dianlujitao 5dcbe701cf fs_config: Fix generation for devices without vendor partition
If the "--all-partitions" argument is empty, the system fs_config should
be generated with all partitions emitted.

Fixes: 8453f02c (fs_config: Fix cases without vendor/oem partition)
Change-Id: I058cfd1c8e665b40757998e773c35e26465bf58a
Signed-off-by: dianlujitao <dianlujitao@lineageos.org>
2019-09-10 16:17:47 +08:00
Bo Hu 045d1e8e68 Merge "emulator: convert sdk_phone_x86 and 64 to CSI"
am: 5242dc18bf

Change-Id: I78d27fe3b48aeecec75c557d9553cd85a06b8560
2019-09-09 20:20:15 -07:00
Bo Hu 5242dc18bf Merge "emulator: convert sdk_phone_x86 and 64 to CSI" 2019-09-10 03:02:12 +00:00
Jooyung Han 76d0eb4d68 Merge "Skip *.libraries.txt when skipping current vndk"
am: 2359e05efb

Change-Id: I972f450e4435be5ca4e77a2d89408882fa6f3305
2019-09-09 18:30:52 -07:00
Jooyung Han 2359e05efb Merge "Skip *.libraries.txt when skipping current vndk" 2019-09-10 01:04:35 +00:00
Colin Cross c018e8dea9 Merge "Use more variables from Soong"
am: d30a949547

Change-Id: Ia89e7b9efb6833cfc07d135a60bad670189e4ab9
2019-09-09 10:38:56 -07:00
Colin Cross d30a949547 Merge "Use more variables from Soong" 2019-09-09 17:21:44 +00:00
Bowgo Tsai 65a1e72cd8 Merge "Moving emulator-specific properties to /system_ext"
am: b1374c9262

Change-Id: Iff60bed0ac8a7e9638bfeadbe8bc39bfd0a50f0e
2019-09-08 19:48:15 -07:00
Treehugger Robot b1374c9262 Merge "Moving emulator-specific properties to /system_ext" 2019-09-09 02:33:19 +00:00
Jooyung Han a3c987d7f3 Skip *.libraries.txt when skipping current vndk
When TARGET_SKIP_CURRENT_VNDK=true current vndk libs are not installed.
Related *.libraries.txt files also should not be installed.

Bug: 132140714
Bug: 137511540
Test: TARGET_SKIP_CURRENT_VNDK=true m systemimage # and, look into /system/etc
Change-Id: Ieea7444c359410dd9a14ac0dd369cae38d18b63a
2019-09-09 11:19:19 +09:00
Xin Li abf6afdce6 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: Ib7d2f7c5a8aef5c6c3e8f74c6c32d5092f32a166
Merged-In: I6f788cb4c7328e4f2315e4f028e2dd53badeb6cd
2019-09-08 13:11:47 -07:00
bohu a3daf2e27c emulator: convert sdk_phone_x86 and 64 to CSI
BUG: 134444564
Change-Id: I88a7bc9ac0eb7cd06cce1f10e6f55a3e4c2c27ea
2019-09-07 08:25:59 -07:00
Yi Kong a0d2141f45 Merge "Add back the llvm-ar P flag"
am: 8206233e51

Change-Id: I6f788cb4c7328e4f2315e4f028e2dd53badeb6cd
2019-09-06 20:50:42 -07:00
Yi Kong 8206233e51 Merge "Add back the llvm-ar P flag" 2019-09-07 03:41:42 +00:00
bohu 9d269381f3 Merge "Update generic_x86_arm for native bridge support"
am: 8b468c14ab

Change-Id: I58618475ef4d84b9868a769f6acf9a1d7086843e
2019-09-06 19:09:30 -07:00
Treehugger Robot 8b468c14ab Merge "Update generic_x86_arm for native bridge support" 2019-09-07 01:43:50 +00:00
Yi Kong 6c5e504c26 Add back the llvm-ar P flag
The P flag is supported as of llvm r354044, add back the flag to reduce
the size of intermediate archieve files. This does not affect the final
binaries.

Test: build
Bug: 71618641
Change-Id: I4021aec783ba341768893392b73b976c1fa5bdf7
2019-09-06 15:19:59 -07:00
Elliott Hughes 6fba8c3926 Merge "Remove unused $MD5SUM."
am: 6b5481fa5e

Change-Id: I6f21dd2e5e84bb166dc484fd258140a54d81ffb3
2019-09-06 14:55:10 -07:00
Elliott Hughes 6b5481fa5e Merge "Remove unused $MD5SUM." 2019-09-06 21:39:15 +00:00
bohu 05f73f0b19 Update generic_x86_arm for native bridge support
BUG: 140623928
Change-Id: I5ea205576393f66421b4edea192d1de9f3249c06
2019-09-06 14:37:17 -07:00
Steven Moreland b34e5ed351 Merge "VNDK -= libhwbinder_noltopgo"
am: ec57c7b4ea

Change-Id: I12fc619392b2a1d81d1d81cfa0e0d6b5613b006c
2019-09-06 11:13:43 -07:00
Elliott Hughes 5602110d73 Remove unused $MD5SUM.
Test: treehugger
Change-Id: I63273b1602362a84beaf32d2260a0a4e35e6ef4d
2019-09-06 11:02:08 -07:00
Vic Yang 2e9839d040 Merge "Set TARGET_VNDK_USE_CORE_VARIANT for Go devices"
am: 63696709ba

Change-Id: Ia13ae9b7d470a304d118d02f865511eec9c86b25
2019-09-06 10:59:30 -07:00
Steven Moreland ec57c7b4ea Merge "VNDK -= libhwbinder_noltopgo" 2019-09-06 17:59:21 +00:00
Vic Yang 63696709ba Merge "Set TARGET_VNDK_USE_CORE_VARIANT for Go devices" 2019-09-06 17:39:40 +00:00
Colin Cross 26296995af Merge "Dist proguard dictionaries for platform builds"
am: c2ecd76a0b

Change-Id: I7fd335d9393b5155aa53f5b8843cdb63226bab1d
2019-09-06 09:23:30 -07:00
Treehugger Robot c2ecd76a0b Merge "Dist proguard dictionaries for platform builds" 2019-09-06 15:53:19 +00:00
Colin Cross 6676057eec Merge "Support injecting boringssl hash in Make"
am: 354dcef215

Change-Id: I78f374cf2720b77e9984ccc0298b21de06244092
2019-09-05 21:31:18 -07:00
Colin Cross 354dcef215 Merge "Support injecting boringssl hash in Make" 2019-09-06 04:16:11 +00:00
Colin Cross 114e8dfa3e Dist proguard dictionaries for platform builds
Proguard dictionaries are useful for platform builds as well as
unbundled builds, produce them for both.

Bug: 140585949
Test: m out/target/product/$(get_build_var TARGET_DEVICE)/${TARGET_PRODUCT}-proguard-dict-eng.ccross.zip
Change-Id: I63b826be35cfbfc9661b5be7de5bea285bd3d3fc
2019-09-05 21:08:38 -07:00
Elliott Hughes 7fde0b2e81 Merge "Switch to toybox stat on macOS too."
am: fdef43d69c

Change-Id: I8f93a2c33a0c0e607f489a70672e8a00a7f5af73
2019-09-05 16:42:06 -07:00
Colin Cross 70bfe07e6c Support injecting boringssl hash in Make
Add LOCAL_INJECT_BSSL_HASH for the two modules in Make that
statically link libcrypto.

Bug: 137267623
Test: m checkbuild
Change-Id: I5d21c262ff388aeb2dbd02595706c5531a628b7e
2019-09-05 15:31:31 -07:00
Colin Cross 7a9acce4ec Keep proguard fields for lite runtime
The lite proto runtime uses reflection to access fields based on the names in
the schema, keep all the fields.

Bug: 117607748
Bug: 140062984
Test: m checkbuild
Change-Id: I39bc7d28f619dd2ccaee603e4d407aa7ad33f534
Merged-In: I39bc7d28f619dd2ccaee603e4d407aa7ad33f534
2019-09-05 14:42:14 -07:00
Colin Cross 4c71549763 Install vendorcompat verison of protobuf
Some prebuilt vendor modules contain references to
libprotobuf-cpp-*.so, but the interface is not stable.  Upgrading
protobuf would cause those modules to fail, so the vendor version
of the new protobuf library is renamed to libprotobuf-cpp-*-3.9.1.so.
Manually install old libprotobuf-cpp-*.so files to /vendor
to avoid breaking products that have prebuilts that reference them.

Once the new version of protobuf is in each product can be
inspected for references to libprotobuf-cpp-*.so on /vendor and
these packages can be included only on those devices that need
them.

Bug: 117607748
Test: m checkbuild
Change-Id: I8ac955eb703e3faf22ff930c59b30385f374ad0a
Merged-In: I8ac955eb703e3faf22ff930c59b30385f374ad0a
2019-09-05 14:42:14 -07:00
Colin Cross 521d4454fa Make javanano a plugin
Treat LOCAL_PROTOC_OPTIMIZE_TYPE := javanano as a plugin by
explicitly passing the path to protoc-gen-javanano.  This allows
removing the javanano customizations from the core plugin code,
which no longer supports javanano natively.

Bug: 117607748
Test: m checkbuild
Change-Id: I913d798136fbee9bfaabe1d815b80c85025cb9b9
Merged-In: I913d798136fbee9bfaabe1d815b80c85025cb9b9
2019-09-05 14:42:14 -07:00
Steven Moreland 80c808fcaf VNDK -= libhwbinder_noltopgo
This library is being deleted. People who need symbols from this library
should use libhwbinder instead.

Bug: 135558503
Test: build only
Change-Id: I7dd343cf2b95047f9c22b39bbc5cd9fa98c6c0b3
2019-09-05 14:30:43 -07:00
Elliott Hughes fdef43d69c Merge "Switch to toybox stat on macOS too." 2019-09-05 21:02:06 +00:00
Xin Li 65a5523790 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
am: c271afebaa -s ours
am skip reason: subject contains skip directive

Change-Id: I67f908997d20462521538a58dd91d4432d0dcbf8
2019-09-05 13:55:32 -07:00
Xin Li 08657f02b4 [automerger skipped] DO NOT MERGE - Merge Android 10 into master
am: 7a05ffb25c -s ours
am skip reason: subject contains skip directive

Change-Id: I389e2d12f62e107f2f91b4134b9da5a3e83ca083
2019-09-05 13:26:20 -07:00