Roland Levillain
fc65a5ff1a
Merge "Remove valgrind-test-art% targets from PARSE_TIME_MAKE_GOALS." am: dbfe39faa2 am: 0e0ffc1053
...
am: 1f355b181d
2019-03-14 06:42:07 -07:00
Roland Levillain
1f355b181d
Merge "Remove valgrind-test-art% targets from PARSE_TIME_MAKE_GOALS." am: dbfe39faa2
...
am: 0e0ffc1053
2019-03-14 06:36:55 -07:00
Roland Levillain
0e0ffc1053
Merge "Remove valgrind-test-art% targets from PARSE_TIME_MAKE_GOALS."
...
am: dbfe39faa2
2019-03-14 06:31:45 -07:00
Roland Levillain
dbfe39faa2
Merge "Remove valgrind-test-art% targets from PARSE_TIME_MAKE_GOALS."
2019-03-14 13:17:46 +00:00
Bowgo Tsai
ddac7dcce1
Sets default value of ro.postinstall.fstab.prefix
...
ro.postinstall.fstab.prefix might be either "/system" or "/product",
to decide the location of the fstab.postinstall, used to mount
system_other partition on A/B devices.
{ro.postinstall.fstab.prefix}/etc/fstab.postinstall
Bug: 112103720
Test: factory reset and boot device, checks cppreopt logs
Change-Id: Ib1e282752c37713e2220239f4f903453ce3c8bab
2019-03-14 16:03:04 +08:00
Nelson Li
ed516e293d
Merge "Revert "Revert "Build System: Solve dependency problem for test""" am: 795721ac2a am: 3c4c86943c
...
am: fd71578493
2019-03-13 21:43:13 -07:00
Nelson Li
fd71578493
Merge "Revert "Revert "Build System: Solve dependency problem for test""" am: 795721ac2a
...
am: 3c4c86943c
2019-03-13 21:39:07 -07:00
Nelson Li
3c4c86943c
Merge "Revert "Revert "Build System: Solve dependency problem for test"""
...
am: 795721ac2a
2019-03-13 21:34:55 -07:00
Treehugger Robot
795721ac2a
Merge "Revert "Revert "Build System: Solve dependency problem for test"""
2019-03-14 04:23:32 +00:00
Nelson Li
1f8357fe7d
Revert "Revert "Build System: Solve dependency problem for test""
...
This reverts commit 6fe7f194b9
2019-03-14 01:05:36 +00:00
Chih-hung Hsieh
8cdaee91cd
Merge "Accept the "file:(project:)?filePath" directive." am: cda227eeaf am: eb617633aa
...
am: aed44f5202
2019-03-13 14:13:27 -07:00
Chih-hung Hsieh
aed44f5202
Merge "Accept the "file:(project:)?filePath" directive." am: cda227eeaf
...
am: eb617633aa
2019-03-13 14:05:17 -07:00
Chih-hung Hsieh
eb617633aa
Merge "Accept the "file:(project:)?filePath" directive."
...
am: cda227eeaf
2019-03-13 14:02:07 -07:00
Chih-hung Hsieh
cda227eeaf
Merge "Accept the "file:(project:)?filePath" directive."
2019-03-13 20:47:10 +00:00
Yifan Hong
69e0d61cbe
Add supernod build target.
...
superimage-nodeps and supernod depends
on images from $(ANDROID_PRODUCT_OUT) (not from
target files package). It doesn't rebuild source
images if they are present.
A typical workflow is:
m -j
# change code in system
m snod -j
m supernod -j
Test: For non retrofit, run:
`m snod -j; m supernod -j`
Fixes: 128321505
Change-Id: Ib8c011cadb9c0cd334234aef39f19be6a48fee62
2019-03-13 11:15:21 -07:00
Roland Levillain
43d2ca50ea
Remove valgrind-test-art% targets from PARSE_TIME_MAKE_GOALS.
...
These targets have been removed from ART Makefiles in 2018.
Test: n/a
Bug: 29282211
Bug: 77856586
Change-Id: I00ab00392d153242a67d0764e3ca2ba0528d79db
2019-03-13 17:28:11 +00:00
Xin Li
2edd635f48
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" am: a6d9bd539a -s ours am: ea1d10caec -s ours
...
am: ce31d6cce6
2019-03-12 23:18:42 -07:00
The Android Open Source Project
e1d5e11d6b
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: 9205ecdbba -s ours am: 27479f1f30 -s ours
...
am: ee96a852ea
2019-03-12 22:56:23 -07:00
Xin Li
ce31d6cce6
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" am: a6d9bd539a -s ours
...
am: ea1d10caec
2019-03-12 22:52:20 -07:00
The Android Open Source Project
ee96a852ea
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: 9205ecdbba -s ours
...
am: 27479f1f30
2019-03-12 22:29:08 -07:00
Xin Li
ea1d10caec
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
...
am: a6d9bd539a
2019-03-12 21:55:40 -07:00
The Android Open Source Project
27479f1f30
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master
...
am: 9205ecdbba
2019-03-12 21:21:32 -07:00
Xin Li
a6d9bd539a
Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
2019-03-13 02:26:04 +00:00
Chih-Hung Hsieh
cc47729719
Accept the "file:(project:)?filePath" directive.
...
Test: checkowners.py some_owner_files
Bug: 126777637
Bug: 126761563
Change-Id: Iee03521681bc38fa28970a015058e1eba3c8b87a
2019-03-12 11:56:33 -07:00
Anton Hansson
ee4c970eb0
System-specific product sysprops
...
This change makes it possible for products to specify the values
of the ro.product.system.X sysprops independently from the
corresponding sysprops on the other partitions.
Leave the fingerprint as-is for now. It will be changed to follow
suit in a followup change.
Bug: 110206836
Test: make
Change-Id: Id30012e1948df792778b102203116d4ae3f68e56
2019-03-12 18:03:44 +00:00
Anton Hansson
ef0b949be3
Rename DEVICE arg in common buildprops script
...
A followup change will make it not always equal TARGET_DEVICE,
so that name is unsuitable. Make its name follow the other product
variables.
Bug: 110206836
Test: presubmit
Change-Id: Icb1422ec5e7af658c5cc3070993c472e99805c6b
2019-03-12 18:03:23 +00:00
Daniel Norman
b144b1f637
Merge "Adds support for optional config files to configure the merge." am: cf9509df01 am: f03c76d047
...
am: 186ae7abb2
2019-03-12 10:15:36 -07:00
Daniel Norman
186ae7abb2
Merge "Adds support for optional config files to configure the merge." am: cf9509df01
...
am: f03c76d047
2019-03-12 10:11:22 -07:00
Daniel Norman
f03c76d047
Merge "Adds support for optional config files to configure the merge."
...
am: cf9509df01
2019-03-12 10:07:13 -07:00
Daniel Norman
cf9509df01
Merge "Adds support for optional config files to configure the merge."
2019-03-12 16:53:31 +00:00
Daniel Norman
2c99c5bbd2
Adds support for optional config files to configure the merge.
...
Bug: 124467065
Test: Running `python merge_target_files.py` using the three new flags
and observing that their contents are passed to the merge_target_files() function.
Change-Id: I4de46f041f5ae8bc8be2730313ce873a952bf78e
2019-03-12 16:51:18 +00:00
Remi NGUYEN VAN
63ab02ff68
Merge "Move NetworkStack in-process from lib to APK" am: c6bf520424 am: 0dda351bf0
...
am: 3ea98a1d22
2019-03-11 19:12:35 -07:00
Remi NGUYEN VAN
3ea98a1d22
Merge "Move NetworkStack in-process from lib to APK" am: c6bf520424
...
am: 0dda351bf0
2019-03-11 19:00:22 -07:00
Remi NGUYEN VAN
0dda351bf0
Merge "Move NetworkStack in-process from lib to APK"
...
am: c6bf520424
2019-03-11 18:49:10 -07:00
Remi NGUYEN VAN
c6bf520424
Merge "Move NetworkStack in-process from lib to APK"
2019-03-12 01:37:26 +00:00
Adam Seaton
3b51987302
[automerger skipped] [Do Not Merge] Update Platform Security String to 2019-05-05 for oc-mr1-dev Bug:128322951 am: 796d90c141 -s ours am: 3d75a015a2
...
am: 520b6c9fe6
2019-03-11 16:08:59 -07:00
Adam Seaton
5d0284498a
[automerger skipped] Merge "[DO NOT MERGE] Update Platform Security string to 2019-05-05 for Pi-dev Bug:128322951" into pi-dev am: 53a4d16512
...
am: 11b19b2cd5
2019-03-11 16:06:48 -07:00
Adam Seaton
520b6c9fe6
[automerger skipped] [Do Not Merge] Update Platform Security String to 2019-05-05 for oc-mr1-dev Bug:128322951 am: 796d90c141 -s ours
...
am: 3d75a015a2
2019-03-11 16:03:18 -07:00
Adam Seaton
3d75a015a2
[automerger skipped] [Do Not Merge] Update Platform Security String to 2019-05-05 for oc-mr1-dev Bug:128322951
...
am: 796d90c141
2019-03-11 15:52:56 -07:00
Adam Seaton
11b19b2cd5
Merge "[DO NOT MERGE] Update Platform Security string to 2019-05-05 for Pi-dev Bug:128322951" into pi-dev
...
am: 53a4d16512
2019-03-11 15:42:24 -07:00
Nelson Li
f5a4af9e91
Merge "Revert "Build System: Solve dependency problem for test"" am: 8924400a8a am: abc1617463
...
am: 87a4a179e1
2019-03-11 15:32:57 -07:00
TreeHugger Robot
53a4d16512
Merge "[DO NOT MERGE] Update Platform Security string to 2019-05-05 for Pi-dev Bug:128322951" into pi-dev
2019-03-11 22:31:32 +00:00
Nelson Li
87a4a179e1
Merge "Revert "Build System: Solve dependency problem for test"" am: 8924400a8a
...
am: abc1617463
2019-03-11 14:55:42 -07:00
Elisa Pascual Trevino
87b6f5f3fc
[automerger skipped] [DO NOT MERGE] Update Security String to 2019-05-01 in oc-mr1-dev Bug: 128322951 am: 801e91776e -s ours am: d6e24caa47
...
am: 9e6ce604c0
2019-03-11 14:52:55 -07:00
Elisa Pascual Trevino
149c05bb53
[automerger skipped] [DO NOT MERGE] Update Security String to 2019-05-01 in pi-dev Bug: 128322951 am: 1159bb8b17
...
am: 21e7b04729
2019-03-11 14:51:12 -07:00
Pavel Salomatov
3fe23692ea
Merge "releasetools: Add compatibility for custom out directory." am: b6f2f8b2d9 am: 0c470d3b8c
...
am: 9a5bc48596
2019-03-11 14:41:41 -07:00
Nelson Li
abc1617463
Merge "Revert "Build System: Solve dependency problem for test""
...
am: 8924400a8a
2019-03-11 14:21:37 -07:00
Elisa Pascual Trevino
9e6ce604c0
[automerger skipped] [DO NOT MERGE] Update Security String to 2019-05-01 in oc-mr1-dev Bug: 128322951 am: 801e91776e -s ours
...
am: d6e24caa47
2019-03-11 14:15:03 -07:00
Elisa Pascual Trevino
21e7b04729
[DO NOT MERGE] Update Security String to 2019-05-01 in pi-dev Bug: 128322951
...
am: 1159bb8b17
2019-03-11 14:14:21 -07:00
Elisa Pascual Trevino
d6e24caa47
[automerger skipped] [DO NOT MERGE] Update Security String to 2019-05-01 in oc-mr1-dev Bug: 128322951
...
am: 801e91776e
2019-03-11 14:12:07 -07:00
