Adam Seaton
f3824973a6
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
am: 4c9adca135
-s ours am: b8d42f935a
am: effbf4f539
am: 131dfae90d
am: 0d6f9c4f2a
-s ours am: f15d15e7c7
am: 06e3c7dc42
am: ab1c4fb3c4
am: f405e6fa54
am: e2e583de4a
-s ours
...
am: 63c4991b50
Change-Id: Ida651941d0156acefadd6800115d607583976052
2017-07-19 21:24:44 +00:00
Adam Seaton
425f796fee
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
am: 4c9adca135
-s ours am: b8d42f935a
am: effbf4f539
am: 131dfae90d
am: 0d6f9c4f2a
-s ours am: f15d15e7c7
am: 06e3c7dc42
am: ab1c4fb3c4
am: f405e6fa54
am: e2e583de4a
-s ours
...
am: 63c4991b50
Change-Id: Ia3066af8ce6cc9fb8615858e5d7833b460562299
2017-07-19 21:24:44 +00:00
Adam Seaton
646b6fdf0b
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1
am: 4b61de46b5
am: 73c3609c53
am: 08425ba495
am: 5aaced88b8
-s ours am: d3f3583872
...
am: 9be9e54195
Change-Id: I71804e3efcf40d357fb2809328fed8babe3b0608
2017-07-19 21:24:43 +00:00
Adam Seaton
763bc1f8a1
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
am: 4c9adca135
-s ours am: b8d42f935a
am: effbf4f539
am: 131dfae90d
am: 0d6f9c4f2a
-s ours am: f15d15e7c7
am: 06e3c7dc42
am: ab1c4fb3c4
-s ours am: 3630da3bdd
-s ours am: 24594261ce
-s ours
...
am: 4ebd91e5c5
-s ours
Change-Id: Ieb0a3bcbd31467d46bc1218e64a23da4cb0eabee
2017-07-19 21:24:42 +00:00
Adam Seaton
7e96035bb8
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1
am: 4b61de46b5
am: 73c3609c53
-s ours am: 1447fa794a
-s ours am: 3bf3f53e5e
-s ours am: b3e05e6d23
-s ours
...
am: 87c38ba25e
-s ours
Change-Id: I5da55f5d6ea75ac03ccd859abdf485fbeb629df4
2017-07-19 21:24:42 +00:00
Adam Seaton
4ebd91e5c5
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
am: 4c9adca135
-s ours am: b8d42f935a
am: effbf4f539
am: 131dfae90d
am: 0d6f9c4f2a
-s ours am: f15d15e7c7
am: 06e3c7dc42
am: ab1c4fb3c4
-s ours am: 3630da3bdd
-s ours
...
am: 24594261ce
-s ours
Change-Id: Icc4f273490a6878f6d407adf88eab459ce64b6b2
2017-07-19 21:21:42 +00:00
Adam Seaton
9be9e54195
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1
am: 4b61de46b5
am: 73c3609c53
am: 08425ba495
am: 5aaced88b8
-s ours
...
am: d3f3583872
Change-Id: Ib8cf37071a15d5080044df2d5c0dc51a0bd8f56d
2017-07-19 21:21:42 +00:00
Adam Seaton
1419ef609f
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1
am: 4b61de46b5
am: 73c3609c53
am: 08425ba495
am: 5aaced88b8
-s ours
...
am: d3f3583872
Change-Id: I57ccd18f406c70e1f2539293a21cab1edbb5fa80
2017-07-19 21:21:41 +00:00
Adam Seaton
63c4991b50
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
am: 4c9adca135
-s ours am: b8d42f935a
am: effbf4f539
am: 131dfae90d
am: 0d6f9c4f2a
-s ours am: f15d15e7c7
am: 06e3c7dc42
am: ab1c4fb3c4
am: f405e6fa54
...
am: e2e583de4a
-s ours
Change-Id: Ibcc0ec2b7cbd5694639f20f94f35fb3661ebd176
2017-07-19 21:21:41 +00:00
Adam Seaton
87c38ba25e
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1
am: 4b61de46b5
am: 73c3609c53
-s ours am: 1447fa794a
-s ours am: 3bf3f53e5e
-s ours
...
am: b3e05e6d23
-s ours
Change-Id: I4440fdb0a8262eed8d7ff0efad94c259b9aa9682
2017-07-19 21:21:41 +00:00
Adam Seaton
e2e583de4a
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
am: 4c9adca135
-s ours am: b8d42f935a
am: effbf4f539
am: 131dfae90d
am: 0d6f9c4f2a
-s ours am: f15d15e7c7
am: 06e3c7dc42
am: ab1c4fb3c4
...
am: f405e6fa54
Change-Id: I54e409432012bff976e81dcceefba395b40a4bad
2017-07-19 21:18:44 +00:00
Adam Seaton
24594261ce
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
am: 4c9adca135
-s ours am: b8d42f935a
am: effbf4f539
am: 131dfae90d
am: 0d6f9c4f2a
-s ours am: f15d15e7c7
am: 06e3c7dc42
am: ab1c4fb3c4
-s ours
...
am: 3630da3bdd
-s ours
Change-Id: Icd1e1e072a1a0ed6b7f4bda6a8501ad563893fa6
2017-07-19 21:18:42 +00:00
Adam Seaton
b3e05e6d23
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1
am: 4b61de46b5
am: 73c3609c53
-s ours am: 1447fa794a
-s ours
...
am: 3bf3f53e5e
-s ours
Change-Id: I430c55ddb7b5a7b6f8f94a2b55ef19a2b1b535db
2017-07-19 21:18:42 +00:00
Adam Seaton
d3f3583872
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1
am: 4b61de46b5
am: 73c3609c53
am: 08425ba495
...
am: 5aaced88b8
-s ours
Change-Id: I60f2772a3c751a6c4bc5fd352ede97bf1b77445b
2017-07-19 21:18:42 +00:00
Adam Seaton
f405e6fa54
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
am: 4c9adca135
-s ours am: b8d42f935a
am: effbf4f539
am: 131dfae90d
am: 0d6f9c4f2a
-s ours am: f15d15e7c7
am: 06e3c7dc42
...
am: ab1c4fb3c4
Change-Id: I7d429cb68e4076c312fb2f8f4e61f3f2b48f5023
2017-07-19 21:15:43 +00:00
Adam Seaton
3630da3bdd
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
am: 4c9adca135
-s ours am: b8d42f935a
am: effbf4f539
am: 131dfae90d
am: 0d6f9c4f2a
-s ours am: f15d15e7c7
am: 06e3c7dc42
...
am: ab1c4fb3c4
-s ours
Change-Id: Id32add2c8c54747e22e8ef96d3484fc1bd91ed61
2017-07-19 21:15:41 +00:00
Adam Seaton
5aaced88b8
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1
am: 4b61de46b5
am: 73c3609c53
...
am: 08425ba495
Change-Id: I0784c9350d75cfd341e38415707bbf6276f09555
2017-07-19 21:15:41 +00:00
Adam Seaton
3bf3f53e5e
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1
am: 4b61de46b5
am: 73c3609c53
-s ours
...
am: 1447fa794a
-s ours
Change-Id: Iee80135e5f9577cb8dd45ba11e7eff0a4f886e11
2017-07-19 21:15:40 +00:00
Adam Seaton
ab1c4fb3c4
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
am: 4c9adca135
-s ours am: b8d42f935a
am: effbf4f539
am: 131dfae90d
am: 0d6f9c4f2a
-s ours am: f15d15e7c7
...
am: 06e3c7dc42
Change-Id: I766d9e551e81801f4293af24f11b4da3a2802120
2017-07-19 21:13:16 +00:00
Adam Seaton
08425ba495
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1
am: 4b61de46b5
...
am: 73c3609c53
Change-Id: I9319957d255084424c82fa759521285786b6a852
2017-07-19 21:13:11 +00:00
Adam Seaton
1447fa794a
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1
am: 4b61de46b5
...
am: 73c3609c53
-s ours
Change-Id: I0a2c0db6add00718249fc09ed448df50d5a2190d
2017-07-19 21:13:10 +00:00
Adam Seaton
06e3c7dc42
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
am: 4c9adca135
-s ours am: b8d42f935a
am: effbf4f539
am: 131dfae90d
am: 0d6f9c4f2a
-s ours
...
am: f15d15e7c7
Change-Id: I0a95c17158d2b5539e98f1b2e7581ff9318c63dd
2017-07-19 21:10:13 +00:00
Adam Seaton
73c3609c53
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 8d56fc91b1
...
am: 4b61de46b5
Change-Id: I5ed82fd3618083cc78ff115905f922b327851461
2017-07-19 21:10:12 +00:00
Adam Seaton
4b61de46b5
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344
...
am: 8d56fc91b1
Change-Id: I835be7d5a11d617daec35067ac269a2d1919d958
2017-07-19 21:07:10 +00:00
Adam Seaton
f15d15e7c7
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
am: 4c9adca135
-s ours am: b8d42f935a
am: effbf4f539
am: 131dfae90d
...
am: 0d6f9c4f2a
-s ours
Change-Id: Ic4866b3c883aae5d107241b473d50135fc9597a7
2017-07-19 21:07:08 +00:00
Adam Seaton
0d6f9c4f2a
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
am: 4c9adca135
-s ours am: b8d42f935a
am: effbf4f539
...
am: 131dfae90d
Change-Id: I6a2181a090e456120f11813309115c7cbeedfa48
2017-07-19 21:04:41 +00:00
Adam Seaton
131dfae90d
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
am: 4c9adca135
-s ours am: b8d42f935a
...
am: effbf4f539
Change-Id: I4710a94c8758dd9f2ec1dcd8a06a51ba1ba85158
2017-07-19 21:02:10 +00:00
Adam Seaton
effbf4f539
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
am: 4c9adca135
-s ours
...
am: b8d42f935a
Change-Id: Id7f8f21fd719ad39b22216c8e99bf28629ac3cb0
2017-07-19 20:59:40 +00:00
Adam Seaton
b8d42f935a
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours am: 4a126acfa7
...
am: 4c9adca135
-s ours
Change-Id: I6c6632af2dc711301523e86637c4cbc6007a91ba
2017-07-19 20:56:39 +00:00
Adam Seaton
4c9adca135
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours am: 6399f470f6
-s ours
...
am: 4a126acfa7
Change-Id: Ic286a81fe536561739207c73178a44f7042b8430
2017-07-19 20:54:08 +00:00
Suren Baghdasaryan
ce4505eb0e
Add makefile to define PRODUCT_SHIPPING_API_LEVEL for O release am: 81a7690eb9
am: 033c79c4fa
...
am: 849929256e
-s ours
Change-Id: I8be38457a3e59b4a7ab946b26d2e0833a5bf0eb9
2017-07-19 20:52:13 +00:00
Adam Seaton
4a126acfa7
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
am: 775c752f51
-s ours
...
am: 6399f470f6
-s ours
Change-Id: Ife92877c9c37bd55f37a448a40a6d05e82c62781
2017-07-19 20:52:08 +00:00
Adam Seaton
6399f470f6
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
am: e29d61d582
...
am: 775c752f51
-s ours
Change-Id: I593b3d0da3b49fc527745dc1d0c7f7eaca32f6ab
2017-07-19 20:49:38 +00:00
Pawin Vongmasa
a910353474
Add libstagefright_soft_flacdec to core_base.mk
...
Test: Play test file from b/37787245
Bug: 37794552
Change-Id: Ib5e4a26b9650e92047587d2e98f992c2df57eede
2017-07-19 13:49:34 -07:00
Adam Seaton
775c752f51
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344 am: 4061effbfe
...
am: e29d61d582
Change-Id: Iebee7e9792304a0ea1e6f2fa59629a4c39526faa
2017-07-19 20:47:13 +00:00
Suren Baghdasaryan
849929256e
Add makefile to define PRODUCT_SHIPPING_API_LEVEL for O release am: 81a7690eb9
...
am: 033c79c4fa
Change-Id: Ifd5dbfe30a524336e60d02a3f7059c234f7c399e
2017-07-19 20:47:11 +00:00
Suren Baghdasaryan
033c79c4fa
Add makefile to define PRODUCT_SHIPPING_API_LEVEL for O release
...
am: 81a7690eb9
Change-Id: I578a54bbd403493d4ffa40c43189d443f0ef119b
2017-07-19 20:44:14 +00:00
Adam Seaton
e29d61d582
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344
...
am: 4061effbfe
Change-Id: Icd9f342e33fb61ac569132d3480d127a5e970b16
2017-07-19 20:44:08 +00:00
Adam Seaton
18be908442
[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344
2017-07-19 20:36:48 +00:00
Suren Baghdasaryan
81a7690eb9
Add makefile to define PRODUCT_SHIPPING_API_LEVEL for O release
...
For Android O release PRODUCT_SHIPPING_API_LEVEL is set to 26.
Change-Id: Ie1d5af375f2db95850fc5395d6a0c775dbfa046d
Merged-In: Ie1d5af375f2db95850fc5395d6a0c775dbfa046d
(cherry picked from commit f3251ac73b
)
2017-07-19 19:52:20 +00:00
Adam Seaton
8d56fc91b1
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344
2017-07-19 18:34:25 +00:00
Adam Seaton
044c8a807d
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344
2017-07-19 18:32:35 +00:00
Adam Seaton
4061effbfe
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344
2017-07-19 18:31:28 +00:00
Adam Seaton
3da103445b
[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344
2017-07-19 18:30:15 +00:00
Adam Seaton
32f388f655
Updating Security String to 2017-09-05 Bug:63846344
2017-07-19 10:42:03 -07:00
Adam Seaton
f1c17f17ff
Updating Security String to 2017-09-01 Bug:63846344
2017-07-19 10:41:05 -07:00
Hung-ying Tyan
58c1b0426f
Fix potential build break
...
When BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED is enabled, the build system
may attempt to create a symlink in TARGET_ROOT_OUT before TARGET_ROOT_OUT
is created. Also make the symbolic link depend on
INSTALLED_DEFAULT_PROP_TARGET so that the symbolic link is properly created
when only bootimage is made.
Bug: 63645797
Test: on non-A/B device, make installclean && make bootimag and then verify
that the symbolic link exists at $(TARGET_ROOT_OUT)/default.prop
Change-Id: Id12916b465ff052e2594b79f28274be20ca53af7
Merged-In: I1a9a2ba49c8252afc13ced3dea71253afbd3091e
2017-07-19 22:42:05 +08:00
Tobias Thierer
5a00891df9
Merge "Make 'make docs' work on OpenJDK 9 toolchain." am: 8003d944a1
am: 32b8d637dc
am: 675d7d56e8
...
am: bce2e113b4
Change-Id: I58a4c89f9f564c633b1d1f8ee31f5b06b16fdc6b
2017-07-19 10:11:59 +00:00
Tobias Thierer
bce2e113b4
Merge "Make 'make docs' work on OpenJDK 9 toolchain." am: 8003d944a1
am: 32b8d637dc
...
am: 675d7d56e8
Change-Id: Iaccc55cb744edb3375173ea11ee040bb8c220f61
2017-07-19 10:06:30 +00:00
Tobias Thierer
675d7d56e8
Merge "Make 'make docs' work on OpenJDK 9 toolchain." am: 8003d944a1
...
am: 32b8d637dc
Change-Id: I337488a0d6d75f8f6635c57c916b6b337ff35f65
2017-07-19 10:01:00 +00:00