Commit Graph

16847 Commits

Author SHA1 Message Date
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
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
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
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
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
John Reck
34d386072e Merge "Disable verity on -eng builds"
am: 9c8120aa48

Change-Id: I90e1db97f8bca14d5d1b5bcd8cea2224f4731fc0
2018-06-11 17:38:29 -07:00
Treehugger Robot
9c8120aa48 Merge "Disable verity on -eng builds" 2018-06-11 21:43:34 +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
Anton Hansson
3c0f857e65 Merge "Rename the poorly named ALL_PRODUCTS variable." 2018-06-08 14:12:35 +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
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
Adam Seaton
f20c71f190 Update Platform security string to 08-05 for August release
bug: 109889880
2018-06-07 14:52:58 -07:00
Treehugger Robot
50ad8c97ac Merge "Revert "Revert "Remove desugar support""" 2018-06-07 20:31:22 +00:00
Yi Kong
e441f4a691 Merge "Add external projects only CFlags option" am: b7306c9ca5
am: cdca782142

Change-Id: Ied808f6e7743a61d2ffe403b84f3ab7e3f833335
2018-06-06 23:57:55 -07:00
Yi Kong
b7306c9ca5 Merge "Add external projects only CFlags option" 2018-06-07 04:51:53 +00:00
Nelson Li
4b7dade5c3 Merge "Revert "Build System: Validate AndroidTest.xml Configs"" am: 79b6e2618a
am: 43b7525dc2

Change-Id: I0e852325f119a19edeeed99c09ccc9ebbebb9230
2018-06-06 21:49:01 -07:00
Treehugger Robot
79b6e2618a Merge "Revert "Build System: Validate AndroidTest.xml Configs"" 2018-06-07 02:50:32 +00:00
Yi Kong
42e18966e2 Add external projects only CFlags option
Apply the flags to Android.mk projects as well.

Test: m checkbuild
Change-Id: Ia5f7f7d9d518820fc825dcf19e8fdd2c434e9013
2018-06-06 16:42:22 -07:00
Colin Cross
8bd764fc7a Merge "Revert "Remove desugar support"" am: bc965aa7a9
am: d175a15e0e

Change-Id: Ie7b75adc17b93d7a5dd6c288dcb3e7adc4b676df
2018-06-06 16:26:07 -07:00
Colin Cross
f44ef3af81 Merge "Remove desugar support" am: 541782f2b4
am: 2d744245a6

Change-Id: I62911d24463cf9c508eee0c5ffca1ebd6b4386f0
2018-06-06 15:25:22 -07:00
Chih-Hung Hsieh
9546d67fe9 Use llvm-{objcopy,strip} when clang lld is used.
* PRIVATE_OBJCOPY is still set to objcopy and used
  when llvm-objcopy cannot replace objcopy.

Bug: 80093681
Test: build/boot with USE_CLANG_LLD=true
Change-Id: I4bd8a53f74864b49e007f0c5f1b0f4b16e121135
2018-06-06 15:09:58 -07:00
Colin Cross
cf010858b6 Revert "Revert "Remove desugar support""
This reverts commit cf7407ed61.

Reason for revert: includes art veridex fix this time

Change-Id: I970b51e6a6c6f377cfe793f029d9674e7ee0ed15
2018-06-06 21:46:25 +00:00
Colin Cross
cf7407ed61 Revert "Remove desugar support"
This reverts commit bfad2c070c.

Reason for revert: broke art veridex build

Change-Id: I0dcc34102ee18b054c2247ae0e2698aca645c667
2018-06-06 21:42:21 +00:00
Nan Zhang
d058de4a77 Change droiddoc.mk to support metalava
Test:  Manually checked-in prebuilt metalava.jar to my local src tree and
      compare the results between old and new docs/stubs generation.
Bug: b/78245848

Change-Id: Ied81cba53c483d4cfb5720e6325b299a1b32104e
Merged-In: I44b4b8ba248ad4deafbb6462e6f7398f15bd2845
2018-06-06 13:32:54 -07:00
Nelson Li
054f210fd5 Revert "Build System: Validate AndroidTest.xml Configs"
This reverts commit 479da2f3bb.

Reason for revert: <revert for b/109736180 #8>

Bug: 109736180
Test: lunch walleye_coverage-userdebug; make adbd_test
Change-Id: I090893e20a2dab0651551361ebf65c26b95a25f2
2018-06-06 18:29:05 +00:00
Colin Cross
bfad2c070c Remove desugar support
Desugaring is always handled by d8 now.

Test: m checkbuild
Change-Id: I8af88522fb1280854ebb4e4957faf70ab59a74f4
2018-06-06 10:06:07 -07:00
John Reck
0588b4337a Disable verity on -eng builds
Verity is counter to the goal of -eng builds, so disable it on -eng
builds.

Change-Id: I9f9851d14948be04834394dc5e5445a36aafa945
Merged-In: I9f9851d14948be04834394dc5e5445a36aafa945
Fixes: 64315394
Test: verified -eng doesn't have verity enabled, but -userdebug does
2018-06-05 15:06:25 -07:00
Colin Cross
a72f7db2eb Merge "Revert "Work around incorrect R8 proguard compatibility"" am: 43aea42876
am: 9200928f8c

Change-Id: I85598e4a79220ba5b13350d4a42c3e7ce89be63e
2018-06-05 14:02:33 -07:00
Colin Cross
43aea42876 Merge "Revert "Work around incorrect R8 proguard compatibility"" 2018-06-05 19:41:49 +00:00
Treehugger Robot
50a3560485 Merge "Build VNDK snapshot for products aosp_[arm|x86]" 2018-06-05 04:18:51 +00:00
Dan Willemsen
7b3a44440d Merge "Darwin: Use nm/otool from Soong instead of PATH" am: 506e00fa6a
am: 8f40cbe2fc

Change-Id: I28c86e1050cacca8c2fa4a5db6392e67b7e0753f
2018-06-04 18:36:36 -07:00
Adam Seaton
ed429ca545 Merge "DO NOT MERGE Update Platform Security String to 2018-07-05 for pi-dev bug: 79883349" into pi-dev
am: 889775dff3

Change-Id: Id410f49480abce946ce82855121539ff201bce09
2018-06-04 12:51:27 -07:00
Yifan Hong
fa41c9a498 Merge "generate-image-prop-dictionary only generates relevant variables" am: 89b40fa645
am: 0b5ec44693

Change-Id: I0537e5afa1d889cc8946f47d47f76015c26eed3a
2018-06-04 10:45:44 -07:00
Colin Cross
c8148cc001 Revert "Work around incorrect R8 proguard compatibility"
This reverts commit cf5180c198.

Reason for revert: r8 behaves more like proguard now.

Bug: 80081393
Test: m checkbuild
Test: examine attributes on com.android.stk.BootCompletedReceiver
      in out/target/common/obj/APPS/Stk_intermediates/classes.dex

Change-Id: I6cff1d7cb6b71023399db6492455f69328dd73f3
2018-06-04 17:25:56 +00:00
Dan Willemsen
e6979a945d Merge "Use hermetic strip for atree" am: 6fac550603
am: 4091033de6

Change-Id: I8b8c6d8263268dd1f8db293a02cd5d9698aabf7e
2018-06-04 10:02:06 -07:00
Dan Willemsen
0c31654ae4 Darwin: Use nm/otool from Soong instead of PATH
Soong now exposes the proper paths to NM & OTOOL so that we don't need
to assume that they're in $PATH.

Test: `m PRODUCT-sdk-sdk` on Mac
Change-Id: If0d963832154841d00ced7a6cfa9de5a014af084
2018-06-03 16:20:08 -07:00
Treehugger Robot
89b40fa645 Merge "generate-image-prop-dictionary only generates relevant variables" 2018-06-02 00:33:28 +00:00
Treehugger Robot
6fac550603 Merge "Use hermetic strip for atree" 2018-06-01 23:58:15 +00:00
Chih-hung Hsieh
2ad673f781 Merge "Skip copying files from LINKED to PACKED directories." am: 7ac56836a1
am: fb47aa4872

Change-Id: I2307bc9ea5ad0b24c1ac9d9bdda9e4f966c47bc0
2018-06-01 16:33:05 -07:00
Chih-hung Hsieh
7ac56836a1 Merge "Skip copying files from LINKED to PACKED directories." 2018-06-01 23:15:16 +00:00
Adam Seaton
9b8b5854e8 DO NOT MERGE Update Platform Security String to 2018-07-05 for pi-dev
bug: 79883349
2018-06-01 23:03:44 +00:00
Dan Willemsen
b90a1f2e2c Merge "Mark more common variables and paths as readonly" am: 297db2d011
am: df09ace764

Change-Id: I30e0ef6ee6b9b207659a8d474de9ce96fe637d23
2018-06-01 15:21:56 -07:00
Treehugger Robot
297db2d011 Merge "Mark more common variables and paths as readonly" 2018-06-01 21:58:14 +00:00
Chih-Hung Hsieh
4c0424908f Merge "Call lld with --pack-dyn-relocs=none if my_pack_module_relocations is false" am: 2a801b3cd7
am: 41685cfe24

Change-Id: I05999fbfbbbacb0530570f955fa83f1b7ae6439d
2018-06-01 14:15:47 -07:00
Chih-Hung Hsieh
9020c2323b Skip copying files from LINKED to PACKED directories.
When stand-alone relocation_packer is not used,
use the LINKED file and skip the copy to PACKED directory.

Test: make checkbuild
Change-Id: Ia1e5d1cd22ca6dfb68e406ffdcbb367b4d07d437
2018-06-01 14:11:15 -07:00