Commit Graph

33499 Commits

Author SHA1 Message Date
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 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 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
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 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
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
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
Baligh Uddin 69164e78cb Remove -host am: a6b90881ca
am: ee0dd8d577

Change-Id: Ibca12230dd969a4ab7267f7a971ca38660ba45e6
2017-02-01 19:39:49 +00:00
Baligh Uddin d4d96f3eee Add libext2_misc to otatools package am: 96755d1296
am: f975623492

Change-Id: I065efaca6c5d8fad1989a97eab3b44c201e5cfe5
2017-02-01 19:39:40 +00:00
Baligh Uddin 1d59782ac2 Merge changes Idd6b24a1,I4323acdb
am: 7ec7da39ad

Change-Id: I134d5cd59bb3fa8ed6ad887468b635d2aba88cb6
2017-02-01 19:35:19 +00:00
Baligh Uddin ee0dd8d577 Remove -host
am: a6b90881ca

Change-Id: Ida76ffc9760e7a5fc227ff90c7c857ff8aa72e82
2017-02-01 19:35:18 +00:00
Baligh Uddin f975623492 Add libext2_misc to otatools package
am: 96755d1296

Change-Id: Ief0fb81aaeb485eef5804cde5f3578fd20cc5ab9
2017-02-01 19:35:10 +00:00
Treehugger Robot 7ec7da39ad Merge changes Idd6b24a1,I4323acdb
* changes:
  Remove -host
  Add libext2_misc to otatools package
2017-02-01 19:29:00 +00:00
Baligh Uddin a6b90881ca Remove -host
Bug: 34689537
Change-Id: Idd6b24a14caa863857303633ba15bd3b41a3a624
(cherry picked from commit b24470e989)
2017-02-01 09:34:41 -08:00
Baligh Uddin 96755d1296 Add libext2_misc to otatools package
Bug: 34689537
Change-Id: I4323acdbadb1c4c8faa6dbb17a79bce72c063407
(cherry picked from commit 3d1ce3a640)
2017-02-01 09:34:06 -08:00
Tao Bao 8433325fba Merge "releasetools: Prepend 'ota-' to 'streaming-property-files'." am: 511f1b9e97 am: f0e13afd7f
am: b4e110ec48

Change-Id: I6c5f8d6a0fe4ae72483e01b04a8a2be00ff62a15
2017-02-01 16:56:30 +00:00
Tao Bao b4e110ec48 Merge "releasetools: Prepend 'ota-' to 'streaming-property-files'." am: 511f1b9e97
am: f0e13afd7f

Change-Id: Icd347b11b88985bdda164976fee412f31a39abfd
2017-02-01 16:54:01 +00:00
Tao Bao f0e13afd7f Merge "releasetools: Prepend 'ota-' to 'streaming-property-files'."
am: 511f1b9e97

Change-Id: I63ae03b416cb29f1e1efb8fc38af611946ad0385
2017-02-01 16:52:01 +00:00
Tao Bao 511f1b9e97 Merge "releasetools: Prepend 'ota-' to 'streaming-property-files'." 2017-02-01 16:46:10 +00:00
Tao Bao bfdcb1257c releasetools: Prepend 'ota-' to 'streaming-property-files'.
'streaming-property-files' is a property related to the OTA package
itself. Prepend 'ota-' to make it consistent with others like
'ota-type' and 'ota-required-cache'.

Bug: 34852392
Test: Generate an A/B OTA package and check METADATA entry.
Change-Id: Ia681e6e19ff509e6da0d8718933b42aac997e1cf
2017-01-31 15:53:20 -08:00
Stephen Hines 40038d8451 Switch to clang-3688880.
Bug: http://b/31532493
Test: Manual validation.
Change-Id: I7c415a1008c368a4b65bac2b5cd3ded3f4bb9de0
2017-01-31 12:12:55 -08:00
Dan Willemsen c8ef7e89b0 Merge "Fix symbol zip creation with OUT_DIR outside source" am: b1201637a4 am: 346ea91089
am: 67e1c13f57

Change-Id: I78b873cfa48b26e5f70c8f0d9dc43076f4555411
2017-01-31 06:24:57 +00:00
Dan Willemsen 67e1c13f57 Merge "Fix symbol zip creation with OUT_DIR outside source" am: b1201637a4
am: 346ea91089

Change-Id: I2cd2404ac90cf56aa509de63b75d785191f8a119
2017-01-31 06:22:55 +00:00
Dan Willemsen 346ea91089 Merge "Fix symbol zip creation with OUT_DIR outside source"
am: b1201637a4

Change-Id: Ie2f436b213c2e76286aa988e7cf6b1dc93454e25
2017-01-31 06:20:24 +00:00
Treehugger Robot b1201637a4 Merge "Fix symbol zip creation with OUT_DIR outside source" 2017-01-31 06:17:20 +00:00
Dan Willemsen 6cf21a7d14 Fix symbol zip creation with OUT_DIR outside source
Bug: 34818739
Test: OUT_DIR=/... m -j /.../aosp_arm64-symbols-eng.dwillemsen.zip
Change-Id: I1d0d3a9f70d3457a536dee6fc25f49a16c353ae8
2017-01-30 20:42:28 -08:00