Commit graph

44296 commits

Author SHA1 Message Date
Anton Hansson
f5986284dc Merge "Add product_services support to ld.config.vndk_lite" am: cf7d0e85d4 am: 13eb788bdc
am: 8c10354e7d

Change-Id: Ia74881217e467e09d0b099b40c4af767e2f85780
2018-09-19 17:46:11 -07:00
Anton Hansson
123c8d261d Merge "Update ld config to use build-time determined paths." am: 70b3fdce20 am: 5933e83e1d
am: 554d01506c

Change-Id: Ibe52f311662013e3100cb1d10b227597ca9a1c1c
2018-09-19 17:43:15 -07:00
Anton Hansson
8c10354e7d Merge "Add product_services support to ld.config.vndk_lite" am: cf7d0e85d4
am: 13eb788bdc

Change-Id: Ia02a15afd206ab373a2359fc97efae050023055e
2018-09-19 17:34:40 -07:00
Anton Hansson
554d01506c Merge "Update ld config to use build-time determined paths." am: 70b3fdce20
am: 5933e83e1d

Change-Id: I563e2fb8323c1ef5a26037f5c4d089d8f53ac634
2018-09-19 17:32:27 -07:00
Anton Hansson
13eb788bdc Merge "Add product_services support to ld.config.vndk_lite"
am: cf7d0e85d4

Change-Id: Ib40f419f7b683a7a273b52b6cab643a8a5d615f5
2018-09-19 17:14:42 -07:00
Anton Hansson
5933e83e1d Merge "Update ld config to use build-time determined paths."
am: 70b3fdce20

Change-Id: I40b3bd729c7b62b6cf37e42b5a9df06b5b6fa001
2018-09-19 17:13:08 -07:00
Anton Hansson
cf7d0e85d4 Merge "Add product_services support to ld.config.vndk_lite" 2018-09-19 20:37:07 +00:00
Anton Hansson
70b3fdce20 Merge "Update ld config to use build-time determined paths." 2018-09-19 20:36:45 +00:00
Anton Hansson
ece0a74691 Add product_services support to ld.config.vndk_lite
We're moving apps and their libs to product_services for older
devices too, so mimic the rules in the default ld.config related
to product_services.

Also fix a one-off disparity between /product and /product_services
in ld.config.txt.

Bug: 114804489
Test: m out/target/product/marlin/system/etc/ld.config.vndk_lite
Change-Id: I166275c035c85b4d69cff8e9d51af3d6d0ff4857
2018-09-19 02:53:33 +01:00
Anton Hansson
0244428c8e Update ld config to use build-time determined paths.
A few places had /product and /product_services hardcoded. Update
them to use values that get set at build time.

Bug: 114804489
Test: m out/target/product/marlin/system/etc/ld.config.vndk_lite.txt
Change-Id: Ie48dbb2453ae941c1b5ee57f092d12a5497d878f
2018-09-19 00:47:12 +01:00
David Anderson
095b731b9d Merge "fastboot: Add vbmeta_mainline to the partition list." am: d800caf345 am: 0f863e101a
am: f2d0524fbe

Change-Id: I4dccc766c6f7954624a86ff00bb7f5be3c70dd7a
2018-09-18 14:30:35 -07:00
Tom Cherry
ba5ac3655b Merge "init: move selinux and seccomp set up to 2nd stage init." am: f273b21232 am: 5cb188a595
am: 5c8e0dcd13

Change-Id: I738081f22138721a2f1025e114c96d7e2f4eb97f
2018-09-18 14:27:49 -07:00
David Anderson
f2d0524fbe Merge "fastboot: Add vbmeta_mainline to the partition list." am: d800caf345
am: 0f863e101a

Change-Id: Ie8b559cfc7f80511e3974380539ecf7566765ae5
2018-09-18 14:22:46 -07:00
Tom Cherry
5c8e0dcd13 Merge "init: move selinux and seccomp set up to 2nd stage init." am: f273b21232
am: 5cb188a595

Change-Id: Id346d29e33d8f30964f99bdfa51750a40df23d2b
2018-09-18 14:21:35 -07:00
David Anderson
0f863e101a Merge "fastboot: Add vbmeta_mainline to the partition list."
am: d800caf345

Change-Id: Ia62e125dfdccaaff258f3a6aa01ec3fbdc24902b
2018-09-18 14:10:19 -07:00
Tom Cherry
5cb188a595 Merge "init: move selinux and seccomp set up to 2nd stage init."
am: f273b21232

Change-Id: Ibc35321ddcbd6327f45bbed8ebf2b82100ba8bb0
2018-09-18 14:05:19 -07:00
Treehugger Robot
d800caf345 Merge "fastboot: Add vbmeta_mainline to the partition list." 2018-09-18 21:03:15 +00:00
Tom Cherry
f273b21232 Merge "init: move selinux and seccomp set up to 2nd stage init." 2018-09-18 20:48:38 +00:00
Chih-Hung Hsieh
75d17366ec Merge "Fix clang-tidy performance warnings in system/core." am: 146fd24c4b am: 8ec85ebdf0
am: 6b18f29be9

Change-Id: I4d565ef1ff31cf5926f65d55e29f638309487db8
2018-09-18 11:25:15 -07:00
Tom Cherry
d9e53dacf5 init: move selinux and seccomp set up to 2nd stage init.
If there is no valid pre-compiled SEPolicy policy, init may call
secilc, which exists on the system partition.  1st stage init won't
always live on this partition, so we need to move this SELinux setup
to 2nd stage init, which always lives on the system partition, to
ensure that both secilc and its caller are updated together.

Bug: 114059212
Test: hikey boots, sailfish boots
Change-Id: Iaf7b4af4a5c2ace16755ec2e54510ab95c53f041
2018-09-18 11:24:56 -07:00
Chih-Hung Hsieh
6b18f29be9 Merge "Fix clang-tidy performance warnings in system/core." am: 146fd24c4b
am: 8ec85ebdf0

Change-Id: I2593f77fe8347283378b80f237480a71311add6a
2018-09-18 11:03:59 -07:00
Chih-Hung Hsieh
8ec85ebdf0 Merge "Fix clang-tidy performance warnings in system/core."
am: 146fd24c4b

Change-Id: I8e681799aaacfb647e61c4c3b5204ac28c4f47c3
2018-09-18 10:49:25 -07:00
Treehugger Robot
146fd24c4b Merge "Fix clang-tidy performance warnings in system/core." 2018-09-18 17:32:20 +00:00
Steven Moreland
be1a480f08 [automerger skipped] Merge "Add libbinder_ndk to public.libraries.*" am: a285a8416c am: 2d6895ef0f
am: 5f42799a7e  -s ours

Change-Id: I801824b54fe6fc4bf53e4134eb1c39f8efe829e5
2018-09-18 09:13:32 -07:00
Steven Moreland
5f42799a7e Merge "Add libbinder_ndk to public.libraries.*" am: a285a8416c
am: 2d6895ef0f

Change-Id: I25b227d81f819a5a99c22ebda993dfe6f6187627
2018-09-18 08:48:27 -07:00
Steven Moreland
2d6895ef0f Merge "Add libbinder_ndk to public.libraries.*"
am: a285a8416c

Change-Id: If495545707d56cb21bf0d5959d4501dfb81d36b7
2018-09-18 08:34:34 -07:00
Steven Moreland
a285a8416c Merge "Add libbinder_ndk to public.libraries.*" 2018-09-18 15:19:44 +00:00
Josh Gao
77f1256a8b Merge "tombstoned: don't generate tombstones for native backtraces." am: 11c7f43b90 am: 88413d74ef
am: cfb22d3e76

Change-Id: I9973b9b6c9f55f8e0f4a3e9d3b89276df95fcae9
2018-09-17 17:53:52 -07:00
Josh Gao
cfb22d3e76 Merge "tombstoned: don't generate tombstones for native backtraces." am: 11c7f43b90
am: 88413d74ef

Change-Id: I4528da468d1c8f28d4ca9b07c9201fdf9e258add
2018-09-17 17:45:49 -07:00
Josh Gao
88413d74ef Merge "tombstoned: don't generate tombstones for native backtraces."
am: 11c7f43b90

Change-Id: Ieb6592be38fbe291e7828e038b6c2d7d05297c6e
2018-09-17 17:39:20 -07:00
David Anderson
1109c92bea fastboot: Add vbmeta_mainline to the partition list.
Bug: 115939310
Test: fastboot flash vbmeta_mainline works
      fastboot flashall includes vbmeta_mainline

Change-Id: I081660cd8437ac66cab750b270f5019230050285
2018-09-17 17:34:22 -07:00
Josh Gao
11c7f43b90 Merge "tombstoned: don't generate tombstones for native backtraces." 2018-09-17 23:57:06 +00:00
TreeHugger Robot
d52aa0301b Merge "Add libbinder_ndk to public.libraries.*" 2018-09-17 23:43:59 +00:00
Xin Li
f1ca87c9eb Merge "Don't attempt to create 'mkdir' and '-p' directories." am: e329879dbf am: 095b6e89db
am: 60af7220a7

Change-Id: Iadb7d808852218a17f7658fd940d78d105e055a3
2018-09-17 16:32:29 -07:00
Xin Li
60af7220a7 Merge "Don't attempt to create 'mkdir' and '-p' directories." am: e329879dbf
am: 095b6e89db

Change-Id: I168e0364798ffb7cc96034227aebd92193cb4626
2018-09-17 16:28:19 -07:00
Xin Li
095b6e89db Merge "Don't attempt to create 'mkdir' and '-p' directories."
am: e329879dbf

Change-Id: Id8d6943e83835e3ab180b689c210f0cf16f91689
2018-09-17 16:22:10 -07:00
Treehugger Robot
e329879dbf Merge "Don't attempt to create 'mkdir' and '-p' directories." 2018-09-17 23:11:28 +00:00
Chih-Hung Hsieh
42bf30651b Fix clang-tidy performance warnings in system/core.
* Use more efficient overloaded string methods.

Bug: 30411878
Test: build with WITH_TIDY=1
Change-Id: I449347565f83fae14ea337d0b3173beb5a56e0ca
2018-09-17 15:18:57 -07:00
Xin Li
17216455ad Don't attempt to create 'mkdir' and '-p' directories.
Test: build
Bug: 115920063
Change-Id: I65c60bfe0ca758a4213f10754bc872ea9885ca19
2018-09-17 14:20:16 -07:00
Steven Moreland
dd8eee871b Add libbinder_ndk to public.libraries.*
Bug: 111445392
Test: atest android.binder.cts.NdkBinderTest
Change-Id: I8ccb1f74654dcb925cd3ac20042cbffd2f594bb9
Merged-In: I8ccb1f74654dcb925cd3ac20042cbffd2f594bb9
2018-09-17 20:05:27 +00:00
Steven Moreland
fbeb8e8c46 Add libbinder_ndk to public.libraries.*
Bug: 111445392
Test: atest android.binder.cts.NdkBinderTest
Change-Id: I8ccb1f74654dcb925cd3ac20042cbffd2f594bb9
(cherry picked from commit fd0dad6825c09b8cc043fd54f679f7782fbf2c26)
2018-09-17 13:04:51 -07:00
Chih-hung Hsieh
eaa4a4ec9f Merge "Suppress implicit-fallthrough warnings." am: 16fef65f9e am: 3784224654
am: 229d380b14

Change-Id: I5b6d3c37333d714cfe89a01d8f933eb0edb470a7
2018-09-17 12:10:36 -07:00
Chih-hung Hsieh
229d380b14 Merge "Suppress implicit-fallthrough warnings." am: 16fef65f9e
am: 3784224654

Change-Id: I42f2e5fcbc5308b3bb2b688bfeda11a496158d4f
2018-09-17 11:47:34 -07:00
Chih-hung Hsieh
3784224654 Merge "Suppress implicit-fallthrough warnings."
am: 16fef65f9e

Change-Id: I71bdcd891f5d41fb90a9e7726aecbf2decdeed2c
2018-09-17 11:29:34 -07:00
Chih-hung Hsieh
16fef65f9e Merge "Suppress implicit-fallthrough warnings." 2018-09-17 17:36:09 +00:00
Chih-Hung Hsieh
502f4864d6 Suppress implicit-fallthrough warnings.
Add FALLTHROUGH_INTENDED for clang compiler.

Bug: 112564944
Test: build with global -Wimplicit-fallthrough.
Change-Id: I40f8bbf94e207c9dd90921e9b762ba51abab5777
2018-09-17 16:50:11 +00:00
Josh Gao
3c2a5166c6 Merge "adbd: fix remount on non-system-as-root devices." am: c2501fda60 am: 31d40d0235
am: 077e5b7dbf

Change-Id: I26821f538dd4e45245e4ebcca766f6bc754cae5e
2018-09-14 18:08:44 -07:00
Peter Collingbourne
5b3930dbbf Merge "libadbd_services: Link libselinux dynamically instead of statically." am: 9cd2a8c2b5 am: 31e1c3f189
am: 29dddac927

Change-Id: Ib27b3e7730b9b8074714959c71336fa66f2f0777
2018-09-14 17:58:47 -07:00
Josh Gao
077e5b7dbf Merge "adbd: fix remount on non-system-as-root devices." am: c2501fda60
am: 31d40d0235

Change-Id: I81de8d605b96d2e7ad55d452e85d63cd185e2224
2018-09-14 17:41:01 -07:00
Peter Collingbourne
29dddac927 Merge "libadbd_services: Link libselinux dynamically instead of statically." am: 9cd2a8c2b5
am: 31e1c3f189

Change-Id: I7cdd09eb7c3461cef08753f8f6bf49e1b19a91e5
2018-09-14 17:31:02 -07:00