Commit graph

35096 commits

Author SHA1 Message Date
Eugene Susla
2e83763928 Include CompanionDeviceManager in build/make/target/product/core.mk
Test: ensure there's no build error
Change-Id: I731543b8ac1fffcb191a2fc8a706b719df3c5b07
2017-02-06 16:11:30 -08:00
Jim Kaye
7cf8429738 Merge "[Emulator] Include the "Cell Broadcast Receiver" app" 2017-02-06 19:31:37 +00:00
Dan Albert
8791fe60d0 Merge "Add c_std and cpp_std properties." am: 220ca4d04b am: 66496c4b96 am: 492a5ff3eb
am: 3bb28719cf

Change-Id: Ifbe68f1cca96b8205f52ac30277a0a454f9c8b8b
2017-02-06 19:29:16 +00:00
Dan Albert
3bb28719cf Merge "Add c_std and cpp_std properties." am: 220ca4d04b am: 66496c4b96
am: 492a5ff3eb

Change-Id: I996cd253525cd5a70ba56432ae1d299abce7f2a4
2017-02-06 19:27:44 +00:00
Dan Albert
492a5ff3eb Merge "Add c_std and cpp_std properties." am: 220ca4d04b
am: 66496c4b96

Change-Id: I88fe9bebf9f389717135a9137762dd932ab7a139
2017-02-06 19:25:38 +00:00
Dan Albert
66496c4b96 Merge "Add c_std and cpp_std properties."
am: 220ca4d04b

Change-Id: Ia1316a1d3f319ada4bcd3bb521015702d413da2b
2017-02-06 19:22:37 +00:00
Treehugger Robot
220ca4d04b Merge "Add c_std and cpp_std properties." 2017-02-06 19:18:27 +00:00
Paul Duffin
68bdd67174 Merge "Revert "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES"" am: 7514ff26ca am: 8ac87364ff am: 5c2f9714ba
am: a01bf0ad27

Change-Id: I93bd7581d288f10c7de2982ba2abd268aa802b2d
2017-02-06 15:14:23 +00:00
Paul Duffin
a01bf0ad27 Merge "Revert "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES"" am: 7514ff26ca am: 8ac87364ff
am: 5c2f9714ba

Change-Id: I86869e79276554fa7bef0b2d7555108126118c34
2017-02-06 15:12:22 +00:00
Paul Duffin
5c2f9714ba Merge "Revert "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES"" am: 7514ff26ca
am: 8ac87364ff

Change-Id: I27a233c7fc82836560b346330a895a1205ab9ff4
2017-02-06 15:10:22 +00:00
Paul Duffin
8ac87364ff Merge "Revert "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES""
am: 7514ff26ca

Change-Id: I86a0c2aa51ec857f5ef36ae375edc8e121653526
2017-02-06 15:07:52 +00:00
Paul Duffin
7514ff26ca Merge "Revert "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES"" 2017-02-06 15:03:14 +00:00
Paul Duffin
fc3d49651d Revert "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES"
This reverts commit 01fc887a07.

A number of build breakages occurred which were not caused by presubmit checks.

Change-Id: I1351dba594c8a8b210416f75a67c68554d5b9372
2017-02-06 14:58:02 +00:00
Paul Duffin
1404c669a8 Merge "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES" am: bdf9ed17a0 am: cf877274e1 am: cf5cc1950a
am: 21ae00e419

Change-Id: Icec86873c136b875b52d630f70308ed94cbc3d54
2017-02-06 13:06:14 +00:00
Paul Duffin
21ae00e419 Merge "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES" am: bdf9ed17a0 am: cf877274e1
am: cf5cc1950a

Change-Id: I7bf48b246dfb0a825b7adf9e03019d3cf73c1cc5
2017-02-06 13:04:14 +00:00
Paul Duffin
cf5cc1950a Merge "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES" am: bdf9ed17a0
am: cf877274e1

Change-Id: I9867a1290cced2fc378000e0effbab875a49c0a4
2017-02-06 13:02:15 +00:00
Paul Duffin
cf877274e1 Merge "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES"
am: bdf9ed17a0

Change-Id: Ifba3ce14cadc8380f9ccd7fb0dff65b74dee4c40
2017-02-06 12:59:44 +00:00
Paul Duffin
bdf9ed17a0 Merge "Remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES" 2017-02-06 12:55:21 +00:00
Tao Bao
6f55619ed6 Merge "releasetools: Fix the bug when generating care_map.txt." am: b0fe0a5d19 am: 1606b2e1fa am: 77f1cd99c6
am: 6fecd473d2

Change-Id: Ifb38e20203cfd410bab20157cd1b5f1ef11c3101
2017-02-06 03:46:42 +00:00
Tao Bao
6fecd473d2 Merge "releasetools: Fix the bug when generating care_map.txt." am: b0fe0a5d19 am: 1606b2e1fa
am: 77f1cd99c6

Change-Id: Id43c8c3e732c039ea7a829206b9aa14904b2cca6
2017-02-06 03:44:12 +00:00
Tao Bao
77f1cd99c6 Merge "releasetools: Fix the bug when generating care_map.txt." am: b0fe0a5d19
am: 1606b2e1fa

Change-Id: I68b29f2ff194a3a365979f89c9c47233fb9a099b
2017-02-06 03:41:13 +00:00
Tao Bao
1606b2e1fa Merge "releasetools: Fix the bug when generating care_map.txt."
am: b0fe0a5d19

Change-Id: I8e3631c2c4c7c814e0e2ce6b94f0bac6d99661f0
2017-02-06 03:38:11 +00:00
Tao Bao
b0fe0a5d19 Merge "releasetools: Fix the bug when generating care_map.txt." 2017-02-06 03:32:28 +00:00
Tao Bao
82bdf6c1d7 releasetools: Fix the bug when generating care_map.txt.
Commit f1a13180db intended to remove the
verity blocks from care_map.txt, but it added new code without removing
the old one. This leads to a malformed care_map.txt and causes
update_verifier failure.

Bug: 34391662
Test: 'm -j dist' gives a TF.zip with 4-line META/care_map.txt (as
      opposed to a 6-line file).

Change-Id: I7ff1aa525795c4b049af54c1755b0f0ea84f7e0e
2017-02-05 14:31:44 -08:00
Dan Albert
76bfcd4ab2 Add c_std and cpp_std properties.
Test: Checked showcommands ouput for each setting.
Bug: None
Change-Id: Ibc25f3977eaaecfd1fb99a27c9e15acae0ec4106
2017-02-03 16:43:06 -08:00
Evgenii Stepanov
1754ba5277 Merge "Disable CFI on Mips and add -march to linkflags on ARM." am: 1604b38040 am: 7cf1fc7661 am: cdd66fb8f2
am: 7304ebafbe

Change-Id: I20e7ecf1c6a5f49f29f246d08edfa5acaa21f177
2017-02-04 00:28:32 +00:00
Evgenii Stepanov
7304ebafbe Merge "Disable CFI on Mips and add -march to linkflags on ARM." am: 1604b38040 am: 7cf1fc7661
am: cdd66fb8f2

Change-Id: I2e7c67e4014e1147d018565e171a615b2ad16f10
2017-02-04 00:23:01 +00:00
Evgenii Stepanov
cdd66fb8f2 Merge "Disable CFI on Mips and add -march to linkflags on ARM." am: 1604b38040
am: 7cf1fc7661

Change-Id: I6a8702e71a38770aa38ee62c9e82e534325055f6
2017-02-04 00:20:01 +00:00
Evgenii Stepanov
7cf1fc7661 Merge "Disable CFI on Mips and add -march to linkflags on ARM."
am: 1604b38040

Change-Id: I574b870df5d208ed018bfc08aa0e5416a229ba5e
2017-02-04 00:17:30 +00:00
Evgenii Stepanov
1604b38040 Merge "Disable CFI on Mips and add -march to linkflags on ARM." 2017-02-04 00:04:22 +00:00
Tianjie Xu
2fd4be8240 Merge "Remove verity blocks from care map" am: 3a79c6d784 am: d4da181f02 am: bb7e8a5d6b
am: 8df8e3a537

Change-Id: I42ad85c8fb9b733d0d6430c432cbe88a33ebcacb
2017-02-03 22:10:00 +00:00
Tianjie Xu
8df8e3a537 Merge "Remove verity blocks from care map" am: 3a79c6d784 am: d4da181f02
am: bb7e8a5d6b

Change-Id: Ic928de0a75fc6a07a4a8c404cd2494547bd64e8c
2017-02-03 22:07:59 +00:00
Tianjie Xu
bb7e8a5d6b Merge "Remove verity blocks from care map" am: 3a79c6d784
am: d4da181f02

Change-Id: Iecdebd9f6130f07819cb203bce2e3a5dfaa99981
2017-02-03 22:01:59 +00:00
Tianjie Xu
d4da181f02 Merge "Remove verity blocks from care map"
am: 3a79c6d784

Change-Id: I3dcdafda0f043cc06fb418f518b64d2f6f4ae046
2017-02-03 21:57:29 +00:00
Tianjie Xu
3a79c6d784 Merge "Remove verity blocks from care map" 2017-02-03 21:50:07 +00:00
Bo Hu
30c77dfe7f Merge "Emulator: set correct rild library path for 64bit arch" 2017-02-01 22:23:17 +00:00
Stephen Hines
9b6e5a351c Merge "Switch to clang-3688880." am: d12816b100 am: 627565d961 am: 0341eb0a7c
am: 635dfdc07a

Change-Id: Ib7e62abfa67188ab881580502c67016493512132
2017-02-01 21:37:34 +00:00
Stephen Hines
635dfdc07a Merge "Switch to clang-3688880." am: d12816b100 am: 627565d961
am: 0341eb0a7c

Change-Id: I8bc2c8b92632a43371e313934368bda5dcb14e8f
2017-02-01 21:35:18 +00:00
Stephen Hines
0341eb0a7c Merge "Switch to clang-3688880." am: d12816b100
am: 627565d961

Change-Id: Ibb8701553a6d548da1ac50ac38c19da71f412ac0
2017-02-01 21:32:43 +00:00
Stephen Hines
627565d961 Merge "Switch to clang-3688880."
am: d12816b100

Change-Id: I1ff206c20271aa809de7dfca7743f4575106de13
2017-02-01 21:30:05 +00:00
Stephen Hines
d12816b100 Merge "Switch to clang-3688880." 2017-02-01 21:25:03 +00:00
bohu
225f804e30 Emulator: set correct rild library path for 64bit arch
BUG: 34861221
Test: build and run sdk_google_phone_x86_64 with emulator
and check radio logcat to make sure it does not complain
about the 32bit library system/lib/libreference-ril.so
being used. Also check the kernel message to make sure
rild is launched properly

Change-Id: I6cbd5abcf64bec9a504066a43fefc55fa698a864
2017-02-01 12:52:48 -08:00
Baligh Uddin
5b2088993b Merge changes Idd6b24a1,I4323acdb am: 7ec7da39ad am: 1d59782ac2 am: a0cb571c9d
am: 7a0f0d302d

Change-Id: I03878ab71fdf69cc6a1656211aa5b056ff64b7f8
2017-02-01 20:13:32 +00:00
Baligh Uddin
9c26b2b292 Remove -host am: a6b90881ca am: ee0dd8d577 am: 69164e78cb
am: 39eb5eec11

Change-Id: Ic4c8213590d578ff4ba84080ee340fb1c4ccad99
2017-02-01 20:13:21 +00:00
Baligh Uddin
3e9022ec9f Add libext2_misc to otatools package am: 96755d1296 am: f975623492 am: d4d96f3eee
am: e3c6fe223c  -s ours

Change-Id: I9db09ccacb634b8cdc91b338667a5e7755943f9b
2017-02-01 20:13:13 +00:00
Evgenii Stepanov
8c50e3c4a8 Disable CFI on Mips and add -march to linkflags on ARM.
Mips toolchain does not have ld.gold.
ARM change is a workaround for LLVM r290384.

Bug: 33678192
Test: make ENABLE_CFI=1
Change-Id: I77a127e0b472d5da10bf45a2983527a714339cb8
2017-02-01 12:13:06 -08:00
Baligh Uddin
7a0f0d302d Merge changes Idd6b24a1,I4323acdb am: 7ec7da39ad am: 1d59782ac2
am: a0cb571c9d

Change-Id: I3e301ef7d1b10e89cc38ec2f1399f78dee6d7317
2017-02-01 19:46:23 +00:00
Baligh Uddin
39eb5eec11 Remove -host am: a6b90881ca am: ee0dd8d577
am: 69164e78cb

Change-Id: Ia8f618fb86fc7ec9a7fb86e45af1a4aa3a7941dd
2017-02-01 19:46:17 +00:00
Baligh Uddin
e3c6fe223c Add libext2_misc to otatools package am: 96755d1296 am: f975623492
am: d4d96f3eee

Change-Id: I593a4ac7ea49b920fcfecad9672edb05d4305a8c
2017-02-01 19:46:10 +00:00
Baligh Uddin
a0cb571c9d Merge changes Idd6b24a1,I4323acdb am: 7ec7da39ad
am: 1d59782ac2

Change-Id: I44496880ce13ebf7dd5f2423ddc842ae34e8b3f6
2017-02-01 19:39:56 +00:00