Commit Graph

45259 Commits

Author SHA1 Message Date
Anton Hansson
fc2778040a Merge "Dedupe packages in mk's that inherit core_minimal.mk" into stage-aosp-master 2018-06-13 18:00:32 +00:00
SzuWei Lin
4905a9f577 [automerger skipped] Merge "Create system.prop for GSI Pi"
am: 59c5127bea  -s ours

Change-Id: I9a5033ce5d06b2df4bb94581cc1a0a645354a704
2018-06-13 10:52:20 -07:00
Anton Hansson
837425b0c0 Add a new macro for products to make artifact path requirements.
When a product adds a path requirement, the build system will verify
that all its artifacts are produced inside these paths, and fail
otherwise.

The paths are all relative to PRODUCT_OUT, and the macro also supports
giving a whitelist, for known existing offenders in the hierarchy. The
build will fail if redundant whitelist entries are present.

Example invocation:
_paths := $(TARGET_COPY_OUT_SYSTEM)/
_whitelist := root/init root/init.rc
$(call require-artifacts-in-path $(_paths), $(_whitelist))

Bug: 80410283
Test: Downstream with a new product definition.
Change-Id: I235de681f65254087a42e345af69b2113b682072
2018-06-13 18:48:53 +01:00
Anton Hansson
5efe88df63 Extract the product to file mapping logic to a macro.
This way, the logic can be reused for multiple products during
the same build step. This will be used to track files output
by different subtrees in the product makefile hierarchy.

Bug: 80410283
Test: diff produt_FILES before and after
Change-Id: I6dd1cf586410b9809fdd9d75441128acb07cab08
2018-06-13 18:48:42 +01:00
Treehugger Robot
59c5127bea Merge "Create system.prop for GSI Pi" 2018-06-13 17:48:06 +00:00
Tao Bao
e89e50e477 Merge "releasetools: Explicitly pass the SHA-1 of source boot image to PatchCheck."
am: 50869f203a

Change-Id: I21bb21342cde6806e5fd300e1da70813562cad13
2018-06-13 10:31:55 -07:00
Tao Bao
50869f203a Merge "releasetools: Explicitly pass the SHA-1 of source boot image to PatchCheck." 2018-06-13 17:20:36 +00:00
Jiyong Park
53acaeab0a Support shared library in recovery mode
The dyanmic linker and the linker config script for the recovery mode
(*.recovery variants) are added to PRODUCT_PACKAGES.

Also this removes the mountpoint /system_root from the recovery image as the
recovery image is self-contained and the real system image is mounted at
/mnt/system which is created automatically at runtime.

Bug: 63673171
Test: `adb reboot recovery; adb devices` shows the device ID
Test: Select 'mount /system' in the recovery mode, then `adb shell`.
$ lsof -p `pidof adbd` shows that libm.so, libc.so, etc. are loaded from
the /lib directory.

Change-Id: Ice6c75b0b81bb9be696aaff3e095d87f19278995
2018-06-14 02:03:57 +09:00
Anton Hansson
abf60f5526 Dedupe packages in mk's that inherit core_minimal.mk
The following packages are moved up one level, into core_minimal.mk
as all its descendants in master share them:
    ContactsProvider
    DefaultContainerService
    libaudiopreprocessing
    libfilterpack_imageproc
    libgabi++
    libstagefright_soft_aacdec
    libstagefright_soft_aacenc
    libstagefright_soft_amrdec
    libstagefright_soft_amrnbenc
    libstagefright_soft_amrwbenc
    libstagefright_soft_avcdec
    libstagefright_soft_avcenc
    libstagefright_soft_flacdec
    libstagefright_soft_flacenc
    libstagefright_soft_g711dec
    libstagefright_soft_gsmdec
    libstagefright_soft_hevcdec
    libstagefright_soft_mp3dec
    libstagefright_soft_mpeg2dec
    libstagefright_soft_mpeg4dec
    libstagefright_soft_mpeg4enc
    libstagefright_soft_opusdec
    libstagefright_soft_rawdec
    libstagefright_soft_vorbisdec
    libstagefright_soft_vpxdec
    libstagefright_soft_vpxenc
    mdnsd
    requestsync

Bug: 80410283
Test: diffed output of multiproduct_kati with aosp/703385 patched
Change-Id: Ic38f7aea3e865dbd9f170925214e3dea5233e61e
2018-06-13 07:44:00 +00:00
Yi Kong
ccb55cee58 Merge "Fix CLANG_EXTERNAL_CFLAGS logic"
am: cfbe8cf3bb

Change-Id: I4d3d28eb7ff1352150593163ff3b4b80d36dbbef
2018-06-12 19:18:59 -07:00
Yi Kong
cfbe8cf3bb Merge "Fix CLANG_EXTERNAL_CFLAGS logic" 2018-06-13 02:10:12 +00:00
Dan Willemsen
0a423b51f2 Merge "Restrict characters in module names"
am: 0f494a025b

Change-Id: Id79395cf3e1af934110eaed3ae1abc084c04aab0
2018-06-12 17:12:50 -07:00
Bjoern Johansson
2bfb5627ea Merge "Support new hostapd build target without HIDL"
am: acbfc3fb94

Change-Id: I13bc909b0ba2204703ccc166ae17624efe8ab3d5
2018-06-12 17:12:15 -07:00
Bo Hu
60acc3ba13 [automerger skipped] Merge "emulator: update aosp sepolicies"
am: 41e2fd3dd8  -s ours

Change-Id: I70f06fdb05d25791868bd7829465bc6d601de717
2018-06-12 17:10:29 -07:00
Treehugger Robot
0f494a025b Merge "Restrict characters in module names" 2018-06-12 23:30:47 +00:00
Yi Kong
0047dbed14 Fix CLANG_EXTERNAL_CFLAGS logic
Should be neq instead of eq.

Test: build-full.ninja is now correct
Change-Id: I26c0aa84d9b54a8b19f19124978ac1d49bae7448
2018-06-12 15:49:12 -07:00
Tao Bao
6d8ec5803b releasetools: Explicitly pass the SHA-1 of source boot image to PatchCheck.
Although the SHA-1 of the source boot image has been encoded in the
filename, the updater code currently doesn't extract that and would fail
to find a matching backup from /cache. This could lead to corrupt
install, if it's interrupted while patching the boot image.

Bug: 80630342
Test: Generate an non-A/B incremental package. Verify the script.
Change-Id: Ie2b1a90836c3ccb4758e1a2d9b69a88de94ae0c7
2018-06-12 15:04:08 -07:00
Dan Willemsen
bbe6a022a3 Restrict characters in module names
See the Changes.md documentation for more information.

Test: build_test on downstream branches
Change-Id: I1524b1dbfd44a7feac3b9a212f37986f870bd837
2018-06-12 13:48:49 -07:00
Chih-Hung Hsieh
4ad173788e Third try to enable clang lld as default linker.
Note of existing configurations:
  * When lld is used, llvm-strip and llvm-objcopy are also used.
  * darwin host modules do not use lld.
  * lld can be disabled locally with use_clang_lld:false in Android.bp
    or LOCAL_USE_CLANG_LLD:=false in Android.mk.

Bug: 73768157
Test: make checkbuild, boot and run bionic and system/core native tests
Change-Id: I3067ff8021dd6e1598f2447b80aea66a3f7e1677
2018-06-12 10:50:10 -07:00
Anton Hansson
f42afaf2a2 resolve merge conflicts of 2ab7fe2fe5 to stage-aosp-master
BUG: None
Test: git diff origin/pi-dev-plus-aosp is empty
Change-Id: Ib99471ae197d753efeeb17be95edbd72326f1358
Merged-In: Iddffd6982df039f5daa8be345de338ba11c63c10
2018-06-12 16:09:49 +01:00
Anton Hansson
5c1dc143cd Dedupe packages in mk's that inherit core_minimal.mk
The following packages are moved up one level, into core_minimal.mk
as all its descendants in master share them:
    ContactsProvider
    DefaultContainerService
    libaudiopreprocessing
    libfilterpack_imageproc
    libgabi++
    libstagefright_soft_aacdec
    libstagefright_soft_aacenc
    libstagefright_soft_amrdec
    libstagefright_soft_amrnbenc
    libstagefright_soft_amrwbenc
    libstagefright_soft_avcdec
    libstagefright_soft_avcenc
    libstagefright_soft_flacdec
    libstagefright_soft_flacenc
    libstagefright_soft_g711dec
    libstagefright_soft_gsmdec
    libstagefright_soft_hevcdec
    libstagefright_soft_mp3dec
    libstagefright_soft_mpeg2dec
    libstagefright_soft_mpeg4dec
    libstagefright_soft_mpeg4enc
    libstagefright_soft_opusdec
    libstagefright_soft_rawdec
    libstagefright_soft_vorbisdec
    libstagefright_soft_vpxdec
    libstagefright_soft_vpxenc
    mdnsd
    requestsync

Bug: 80410283
Test: diffed output of multiproduct_kati with aosp/703385 patched
Change-Id: Ic38f7aea3e865dbd9f170925214e3dea5233e61e
Merged-In: Ic38f7aea3e865dbd9f170925214e3dea5233e61e
2018-06-12 15:25:06 +01:00
Treehugger Robot
acbfc3fb94 Merge "Support new hostapd build target without HIDL" 2018-06-12 12:49:49 +00:00
Bo Hu
41e2fd3dd8 Merge "emulator: update aosp sepolicies" 2018-06-12 12:49:43 +00:00
SzuWei Lin
326ad779c1 Create system.prop for GSI Pi
Properties for GSI Pi are not exactly the same as those for legacy GSI.
Create a new gsi_system.prop for GSI Pi to avoid reusing legacy
treble_system.prop used by legacy GSI (aosp_$arch_a(b) products).

Bug: 78605339
Test: build and observe the system/build.prop
Change-Id: I435e33558e244009af9a91a97580fd56591ff6f3
Merged-In: I435e33558e244009af9a91a97580fd56591ff6f3
(cherry picked from commit 3fc49fede8)
2018-06-12 18:03:31 +08:00
Anton Hansson
2ab7fe2fe5 Merge "Dedupe mk rules in core_minimal.mk and core_tiny.mk." 2018-06-12 09:32:54 +00:00
John Reck
34d386072e Merge "Disable verity on -eng builds"
am: 9c8120aa48

Change-Id: I90e1db97f8bca14d5d1b5bcd8cea2224f4731fc0
2018-06-11 17:38:29 -07:00
Bjoern Johansson
a53c522678 Support new hostapd build target without HIDL
The new build target for hostapd does not include the HIDL control
interface and it's a separate binary from the hostapd used for WiFi
hotspots. This new binary needs its own SELinux rules and it should be
included in emulator builds since it's used to provide virtual access
points.

BUG: 74401469
Test: run cts -m CtsNetTestCases
Change-Id: I6a654ac2dea20af048ac731876ac603773fcf3d8
2018-06-11 15:56:51 -07:00
bohu
3a83195522 emulator: update aosp sepolicies
There have been quite some changes that should go to aosp.
This CL squash all of them into a single one.

Change-Id: I1e8d172b99cc98c93f2925fef32da8b461c277ed
Merged-In: I93b8489f710d194917d4b482ebca960c39658fd9
Merged-In: Ifac85db4e13d0b946f91b7eeffb4288d40d0ebb8
2018-06-11 15:56:25 -07:00
Treehugger Robot
9c8120aa48 Merge "Disable verity on -eng builds" 2018-06-11 21:43:34 +00:00
Andreas Gampe
a605d8892c Merge changes from topic "update_errorprone_2.3.1"
am: 92222c3a62

Change-Id: Id10459090d32d19eb47a77c61d0b9cd8af5c6da0
2018-06-11 13:06:56 -07:00
Treehugger Robot
92222c3a62 Merge changes from topic "update_errorprone_2.3.1"
* changes:
  Tools: Update warn.py for Errorprone 2.3.1
  Tools: Sort Errorprone warn.py entries by name
2018-06-11 19:37:59 +00:00
Anton Hansson
9f7cc0d0ab Dedupe mk rules in core_minimal.mk and core_tiny.mk.
These two are the only ones inheriting base.mk, and were largely similar.
This CL moves all the shared stuff up one level into base.mk.

One thing not de-duped yet is the PRODUCT_SYSTEM_SERVER_JARS variable,
as the order of that is significant.

Also sort various lists that were ordered arbitrarily.

Bug: 80410283
Test: diffed output of multiproduct_kati with aosp/703385 patched
Change-Id: Iddffd6982df039f5daa8be345de338ba11c63c10
Merged-In: Iddffd6982df039f5daa8be345de338ba11c63c10
2018-06-11 15:18:01 +01:00
Justin Yun
5d8dd1656b Merge "Include VNDK snapshot for 32 bit binder"
am: e59bb32cb7

Change-Id: Ia0b6864fcf44930003f687d2849d970e67ea49df
2018-06-10 18:54:58 -07:00
Treehugger Robot
e59bb32cb7 Merge "Include VNDK snapshot for 32 bit binder" 2018-06-11 01:49:02 +00:00
Xin Li
c8e90b5da3 Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug: 79597307
Change-Id: I06ede5004b16e1ac0bb5c1c6a225c3c307bd26d1
2018-06-08 11:06:45 -07:00
Andreas Gampe
b9dc23a4d8 Tools: Update warn.py for Errorprone 2.3.1
Note: this uses the default severity in Errorprone, modulo
forced-ERROR settings in Android.

Bug: 72971960
Test: manual
Change-Id: I6d8b855b88289b763b2a98e8685627bf1163989d
2018-06-08 10:24:35 -07:00
Andreas Gampe
2e987af407 Tools: Sort Errorprone warn.py entries by name
To improve updateability.

Bug: 72971960
Test: none
Change-Id: I7ab7cdfe53518b29d036f418fe66aef69b5e409a
2018-06-08 10:22:59 -07:00
Anton Hansson
f72274c10b Merge "Remove redundant package includes from makefiles."
am: e91269dc65

Change-Id: I1cac2bcbf3772f60b48725434e993e9a5b73f1d3
2018-06-08 07:28:13 -07:00
Anton Hansson
0230e77216 Merge "Rename the poorly named ALL_PRODUCTS variable."
am: 3c0f857e65

Change-Id: I8489f0f964d7f6ed364429e5be121832969c9129
2018-06-08 07:22:59 -07:00
Anton Hansson
e91269dc65 Merge "Remove redundant package includes from makefiles." 2018-06-08 14:20:50 +00:00
Anton Hansson
3c0f857e65 Merge "Rename the poorly named ALL_PRODUCTS variable." 2018-06-08 14:12:35 +00:00
Justin Yun
6c52bb0d33 Include VNDK snapshot for 32 bit binder
Use the VNDK sanpshot that matches the version of the target binder.

Bug: 74362637
Bug: 80450527
Test: m -j vndk_snapshot_package
Change-Id: I7d540654c9554f9d8a1feaec5eb441389d3960cb
2018-06-08 06:19:44 +00:00
Chih-Hung Hsieh
221572a7b4 Merge "Use llvm-{objcopy,strip} when clang lld is used." am: 87d8dc4d4e
am: ef534a7888

Change-Id: I25f238309ed4da074ca908d6636fca8cf4f4963f
2018-06-07 21:07:50 -07:00
Bo Hu
23508266a8 Merge "emulator: allows vendor_init to set qemu_props" into pi-dev
am: 8e2f247ca1

Change-Id: Ifac85db4e13d0b946f91b7eeffb4288d40d0ebb8
2018-06-07 21:05:49 -07:00
Chih-Hung Hsieh
ef534a7888 Merge "Use llvm-{objcopy,strip} when clang lld is used."
am: 87d8dc4d4e

Change-Id: I4e02dc7ce129627a7ed823bacdeebbb7cf9cf1f4
2018-06-07 19:51:20 -07:00
Bo Hu
8e2f247ca1 Merge "emulator: allows vendor_init to set qemu_props" into pi-dev 2018-06-08 02:48:22 +00:00
Treehugger Robot
87d8dc4d4e Merge "Use llvm-{objcopy,strip} when clang lld is used." 2018-06-08 00:42:03 +00:00
Adam Seaton
ec658daa02 Update Platform security string to 08-05 for August release bug: 109889880
am: f20c71f190

Change-Id: I08103150da5c1afe2355a4869fe51ca0dcfc3927
2018-06-07 17:08:09 -07:00
Colin Cross
b71570fc8c Merge "Revert "Revert "Remove desugar support""" am: 50ad8c97ac
am: 9f0e4a430f

Change-Id: I8ef7ec33394af7fd7afab4455f79a932ee774b92
2018-06-07 15:49:03 -07:00
Chih-Hung Hsieh
d3c68d8d29 Merge "Fix gpylint warnings." am: 0e97b65785
am: 1ed590cf90

Change-Id: I62126d0fcaa2a6b7b3795ed80a401cd951308439
2018-06-07 15:36:07 -07:00