Mathieu Chartier
161db06003
Add showmap and procrank to PRODUCT_PACKAGES_DEBUG
...
So that they are available on device by default.
Test: make
Change-Id: If3c1513d1c086f965a8adc157a96b35c119962c3
2018-06-27 14:14:06 -07:00
Pirama Arumuga Nainar
b8f0085dba
Merge "Do not set entry-point for Windows" am: 645b8db09a
am: 783c0bd833
...
am: 8ffb008e88
Change-Id: I2c407e1fad8978baa4c117cbb7c0a4314d85d793
2018-06-27 13:38:54 -07:00
Pirama Arumuga Nainar
8ffb008e88
Merge "Do not set entry-point for Windows" am: 645b8db09a
...
am: 783c0bd833
Change-Id: I0c0edd3bdc25fdc7131b79e7ebd9cc8e4ea809bc
2018-06-27 13:35:45 -07:00
Pirama Arumuga Nainar
9d142286d3
Merge "Use $(my_prefix)OS instead of HOST_CROSS_OS" am: 69af20f184
am: 897b03f9ee
...
am: f0a1fd6f5c
Change-Id: Ie25d0da633cc780c668b140b9b58dead9012e058
2018-06-27 13:28:05 -07:00
Pirama Arumuga Nainar
783c0bd833
Merge "Do not set entry-point for Windows"
...
am: 645b8db09a
Change-Id: Ia4982902151b800b58a3cfa488ccfddecb6aa662
2018-06-27 13:26:34 -07:00
Treehugger Robot
645b8db09a
Merge "Do not set entry-point for Windows"
2018-06-27 20:22:23 +00:00
Pirama Arumuga Nainar
f0a1fd6f5c
Merge "Use $(my_prefix)OS instead of HOST_CROSS_OS" am: 69af20f184
...
am: 897b03f9ee
Change-Id: I23e85438df9b7c33e2cc6805843692cee047bb79
2018-06-27 13:17:40 -07:00
Pirama Arumuga Nainar
897b03f9ee
Merge "Use $(my_prefix)OS instead of HOST_CROSS_OS"
...
am: 69af20f184
Change-Id: I9006ed1815f52f31a05ec9eb190672fc0d0b3da9
2018-06-27 13:14:30 -07:00
Treehugger Robot
69af20f184
Merge "Use $(my_prefix)OS instead of HOST_CROSS_OS"
2018-06-27 20:08:04 +00:00
Pirama Arumuga Nainar
4b049648fa
Merge "Use $(my_prefix)OS instead of HOST_CROSS_OS" am: 1caedd6bdc
am: 71b8769e5c
...
am: bf5372250a
Change-Id: I35f2a1a25deb67f6653b661e4e41e830e313845e
2018-06-27 12:11:37 -07:00
Pirama Arumuga Nainar
bf5372250a
Merge "Use $(my_prefix)OS instead of HOST_CROSS_OS" am: 1caedd6bdc
...
am: 71b8769e5c
Change-Id: If4e1ed2a6c85a5041efbc2d11093fbff7e97cdfc
2018-06-27 11:47:21 -07:00
Pirama Arumuga Nainar
71b8769e5c
Merge "Use $(my_prefix)OS instead of HOST_CROSS_OS"
...
am: 1caedd6bdc
Change-Id: Ic7d6fc7d44167e22c196de8275dc27c88e2f714a
2018-06-27 11:41:12 -07:00
Treehugger Robot
1caedd6bdc
Merge "Use $(my_prefix)OS instead of HOST_CROSS_OS"
2018-06-27 18:28:34 +00:00
Pirama Arumuga Nainar
b448834e96
Do not set entry-point for Windows
...
Bug: http://b/62424007
This breaks 64-bit Windows executables. Probably due to the Clang
migration, the entry-point need not be set even for 32-bit executables.
Test: 32-bit and 64-bit aapt2_tests.exe and ziparchive-tests.exe can
start. (There are some failed tests, though).
Change-Id: I1dea9137c79c5f26b493640cfae0856c1a7ea301
2018-06-27 11:28:33 -07:00
Pirama Arumuga Nainar
060741e77d
Use $(my_prefix)OS instead of HOST_CROSS_OS
...
The latter is not module-specific and affects all host modules. Also
remove the check for LOCAL_IS_HOST_MODULE and use $(my_prefix)OS.
This should be future-proof, where may use different configurations of
cross-compilations across Linux, Darwin, Windows.
Test: m native
Change-Id: I0a6255a8b83960ffb543b593d4a50d963be1de88
2018-06-27 10:37:54 -07:00
Pirama Arumuga Nainar
407b6aca28
Use $(my_prefix)OS instead of HOST_CROSS_OS
...
The latter is not module-specific and prevents santizer configuration
for all host modules.
Test: mma HOST_SANITIZE=address hardware/google/apf
Change-Id: I62a448973c1d6526e4b475f3288996e44c88fbc9
2018-06-27 09:42:33 -07:00
Anton Hansson
70224e7e01
Merge "Sort lists in AndroidProducts.mk." am: 14add31780
am: 8bb6f0d5db
...
am: 460efa855f
Change-Id: Ia3582cc0bf618c5a3fa1e6a14a3c2e25868fc34e
2018-06-27 08:53:45 -07:00
Anton Hansson
460efa855f
Merge "Sort lists in AndroidProducts.mk." am: 14add31780
...
am: 8bb6f0d5db
Change-Id: I0fed462ca96dfa8d193b088763146726c1379413
2018-06-27 08:49:03 -07:00
Anton Hansson
8bb6f0d5db
Merge "Sort lists in AndroidProducts.mk."
...
am: 14add31780
Change-Id: Ia6192fa02cf70f97cb1ef2f1ed64e2746a74b2c2
2018-06-27 08:43:56 -07:00
Treehugger Robot
14add31780
Merge "Sort lists in AndroidProducts.mk."
2018-06-27 15:33:52 +00:00
Anton Hansson
1555709499
Sort lists in AndroidProducts.mk.
...
Test: No
Change-Id: I4147103eee03ef9af500e73fd4481f11c19580ec
2018-06-27 14:43:21 +01:00
Anton Hansson
34a67d5920
Merge "Split up fs_config_* modules per partition." am: 4e0ccc4c8a
am: 04750bc03a
...
am: e290bd9725
Change-Id: I8f79ffe9db4fdd4a8ddde2ca2966eabed94a6269
2018-06-27 06:16:01 -07:00
Anton Hansson
e290bd9725
Merge "Split up fs_config_* modules per partition." am: 4e0ccc4c8a
...
am: 04750bc03a
Change-Id: Ie7822db275e7252ff2ae3b1c2645e957020530bf
2018-06-27 06:11:18 -07:00
Anton Hansson
04750bc03a
Merge "Split up fs_config_* modules per partition."
...
am: 4e0ccc4c8a
Change-Id: I82751b7f53a22bdcccb6667dfb17089d296dd43c
2018-06-27 06:07:11 -07:00
Anton Hansson
4e0ccc4c8a
Merge "Split up fs_config_* modules per partition."
2018-06-27 12:59:22 +00:00
Anton Hansson
b2c9856570
Merge "Remove core_base.mk" am: cc496f9b61
am: 5b39368282
...
am: 8200c9ff59
Change-Id: I82905239fd4e7d00bc8998e8ef944527de826d23
2018-06-27 04:49:40 -07:00
Anton Hansson
8200c9ff59
Merge "Remove core_base.mk" am: cc496f9b61
...
am: 5b39368282
Change-Id: Ife73635562914f9662ed6c30242b9bb57e26ad15
2018-06-27 04:45:29 -07:00
Anton Hansson
5b39368282
Merge "Remove core_base.mk"
...
am: cc496f9b61
Change-Id: I55e203de13b9ed6bdc18b73a9a77f898f34bb1b8
2018-06-27 04:41:20 -07:00
Anton Hansson
cc496f9b61
Merge "Remove core_base.mk"
2018-06-27 11:36:31 +00:00
Anton Hansson
e85ec84eef
Split up fs_config_* modules per partition.
...
This was already done for partitions other than the system partition.
Add new, separate "_system" targets, and add new phony modules which
collects _system and _nonsystem targets for now.
Update the base_system.mk file to only depend on the system module, and
put the other ones in base_vendor.mk for now.
Bug: 80410283
Test: make fs_config_dirs[_*] fs_config_files[_*] and verify output
Change-Id: I7843578dbb9f27edf4c1e5b4a795a530f79e0be1
2018-06-27 11:15:59 +01:00
Anton Hansson
c23ef03838
Remove core_base.mk
...
It's small, and doesn't really have a theme so it doesn't really warrant
its own build file. Inline its contents in all its children.
Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: I7db95f9134df36ebd0271e21dba1fa13b28afc72
2018-06-27 09:56:56 +01:00
Anton Hansson
0eebb8369a
Merge "Move 6 packages up from core_base.mk" am: a314fc0166
am: 9f4917bc9f
...
am: b152b8740c
Change-Id: I885364e926a05a60fbcb590733c31928c82423ba
2018-06-27 01:42:32 -07:00
Anton Hansson
3590fc514c
[automerger skipped] Merge "Split base.mk into system and vendor parts." am: 351a147cd7
-s ours am: 3a9fa70d5a
-s ours
...
am: e1868a8d64
-s ours
Change-Id: I9bcdfd8bc5560796c081ca8950fde4173475fa98
2018-06-27 01:41:43 -07:00
Anton Hansson
b152b8740c
Merge "Move 6 packages up from core_base.mk" am: a314fc0166
...
am: 9f4917bc9f
Change-Id: I373732ea133157172d376334106e58ed4c9e8235
2018-06-27 01:38:49 -07:00
Anton Hansson
e1868a8d64
[automerger skipped] Merge "Split base.mk into system and vendor parts." am: 351a147cd7
-s ours
...
am: 3a9fa70d5a
-s ours
Change-Id: I6ca01f204514be7c392789522481abd26d9f53d3
2018-06-27 01:38:08 -07:00
Anton Hansson
9f4917bc9f
Merge "Move 6 packages up from core_base.mk"
...
am: a314fc0166
Change-Id: I8c9bc72e2f1b2bb7c2ce5bfb53dbd29b5005307b
2018-06-27 01:35:12 -07:00
Anton Hansson
3a9fa70d5a
[automerger skipped] Merge "Split base.mk into system and vendor parts."
...
am: 351a147cd7
-s ours
Change-Id: I08fd19e18ded0b99946fbb9f7a77e7e76ca6cedd
2018-06-27 01:34:36 -07:00
Anton Hansson
a314fc0166
Merge "Move 6 packages up from core_base.mk"
2018-06-27 08:30:08 +00:00
Anton Hansson
351a147cd7
Merge "Split base.mk into system and vendor parts."
2018-06-27 08:29:40 +00:00
Mathieu Chartier
68df483570
[automerger skipped] Merge "Move go default system properties into prop files" am: 47ad7d0f60
-s ours am: 1be0b776a2
...
am: eabbf7268f
-s ours
Change-Id: I4cbcfe4d26c28c2b09458807efc69558262223c4
2018-06-26 18:00:14 -07:00
Mathieu Chartier
eabbf7268f
[automerger skipped] Merge "Move go default system properties into prop files" am: 47ad7d0f60
-s ours
...
am: 1be0b776a2
Change-Id: I26ac0fa1990ad0d793ace3bb64508798686e9922
2018-06-26 17:56:46 -07:00
Mathieu Chartier
1be0b776a2
[automerger skipped] Merge "Move go default system properties into prop files"
...
am: 47ad7d0f60
-s ours
Change-Id: If1ce48b6d8f47baacca0db93b57fb70e04c3b978
2018-06-26 17:24:30 -07:00
Pirama Arumuga Nainar
025bd90007
Merge "Do not enable sanitizers on Windows" am: 0d53f4b12b
am: a743e206ef
...
am: 5a5588a999
Change-Id: If0cfc45ae383f097204565d279fef2a60ac6a011
2018-06-26 17:12:41 -07:00
Mathieu Chartier
47ad7d0f60
Merge "Move go default system properties into prop files"
2018-06-27 00:09:27 +00:00
Pirama Arumuga Nainar
5a5588a999
Merge "Do not enable sanitizers on Windows" am: 0d53f4b12b
...
am: a743e206ef
Change-Id: Ife8a84916ce8289981bbabde8c0e48f597d07eba
2018-06-26 17:08:38 -07:00
Pirama Arumuga Nainar
a743e206ef
Merge "Do not enable sanitizers on Windows"
...
am: 0d53f4b12b
Change-Id: I96fde141a4d27c231947f65f3917da30a311b420
2018-06-26 17:05:24 -07:00
Treehugger Robot
0d53f4b12b
Merge "Do not enable sanitizers on Windows"
2018-06-26 23:28:29 +00:00
Anton Hansson
3e9e8a0ebb
[automerger skipped] Merge "Split base.mk into system and vendor parts." into stage-aosp-master am: 8500a01e0c
-s ours
...
am: 02d53cd7c0
-s ours
Change-Id: I66c9e98892bb8227e11f9626ae1a222daa838ecb
2018-06-26 15:15:43 -07:00
Mathieu Chartier
f39c2c7495
Move go default system properties into prop files
...
Test: manual
Bug: 110517986
(cherry-picked from commit 732a4cc62f
)
Merged-In: I28f5c18bb9e70c755ece50c49c02434f825878dc
Change-Id: I28f5c18bb9e70c755ece50c49c02434f825878dc
2018-06-26 15:12:46 -07:00
Mathieu Chartier
cb96967304
Merge "Move go default system properties into prop files"
2018-06-26 22:08:58 +00:00