Jayant Chowdhary
14316678df
Merge "Add RenderScript Toolchain information to Soong."
...
am: 9b49502b95
Change-Id: Ie63ec80dd5c699668aa5408c2af306ab9c5f5d0d
2017-02-08 17:59:40 +00:00
Jayant Chowdhary
9b49502b95
Merge "Add RenderScript Toolchain information to Soong."
2017-02-08 17:45:38 +00:00
Tao Bao
d72edb3c23
Merge "releasetools: Support generating downgrade A/B OTAs." am: e73d4daf41
am: e79da16cc0
...
am: a256b3fef0
Change-Id: I6f76d4b723bc875cffdf7f52f8579bad80589944
2017-02-08 05:56:19 +00:00
Tao Bao
a256b3fef0
Merge "releasetools: Support generating downgrade A/B OTAs." am: e73d4daf41
...
am: e79da16cc0
Change-Id: I1dcfd2e459a8d20f571662be289d8bea3616a012
2017-02-08 05:53:18 +00:00
Tao Bao
e79da16cc0
Merge "releasetools: Support generating downgrade A/B OTAs."
...
am: e73d4daf41
Change-Id: I9732ac6c6856757374df2cebae792caabcc1e04f
2017-02-08 05:50:19 +00:00
Tao Bao
e73d4daf41
Merge "releasetools: Support generating downgrade A/B OTAs."
2017-02-08 05:46:07 +00:00
Simran Basi
7166d1f43a
Output *TS testcases to common testcase folders.
...
Aggregates the different *TS testcases into two common folders,
one under each the host and product hierarchies.
Bug: 34715822
Test: `make cts -j` and checked the contents of both:
out/host/linux-x86/testcases/ &
out/host/linux-x86/cts/android-cts/testcases/
Change-Id: I7d5201998ddcb011ecc687c272a0d0a36da248b7
2017-02-07 14:49:06 -08:00
Tao Bao
b31892e5de
releasetools: Support generating downgrade A/B OTAs.
...
We already support generating downgrade OTAs for non-A/B devices (with
mandatory data wipe), but we have missed the --downgrade flag in A/B OTA
path.
This CL factors out the function that writes the downgrade metadata, and
fixes the path for generating A/B OTAs.
Bug: 35094540
Test: Generate incrementals with --downgrade for A/B and non-A/B OTAs.
Change-Id: I30b9bf83e69e8aba3be666507681b555db6ab743
2017-02-07 12:25:59 -08:00
Tao Bao
1fc6746045
Merge "releasetools: Pack the offset/length for metadata." am: b09fef9158
am: 8619174658
...
am: f4eaa3f503
Change-Id: I9692d846ad7e89ea4d39ceb2549c241538a6a143
2017-02-07 04:31:43 +00:00
Tao Bao
f4eaa3f503
Merge "releasetools: Pack the offset/length for metadata." am: b09fef9158
...
am: 8619174658
Change-Id: I8eed8ff13cb5eec979ee83a9cf59458205e78446
2017-02-07 04:22:12 +00:00
Tao Bao
8619174658
Merge "releasetools: Pack the offset/length for metadata."
...
am: b09fef9158
Change-Id: Ie0ec163d581bc4a9860030fe35769d621eb9e748
2017-02-07 04:19:13 +00:00
Tao Bao
b09fef9158
Merge "releasetools: Pack the offset/length for metadata."
2017-02-07 04:16:20 +00:00
Dan Willemsen
9c2e892f4c
Merge "Add USE_SOONG_UI to trigger soong_ui in Make mode" am: 86a1c9f916
am: 807f6927c7
...
am: b2d74278a7
Change-Id: I559840491703444c9b20e47397b57a8a1d78b48b
2017-02-07 02:28:35 +00:00
Dan Willemsen
b2d74278a7
Merge "Add USE_SOONG_UI to trigger soong_ui in Make mode" am: 86a1c9f916
...
am: 807f6927c7
Change-Id: I6f1e30f9243c2d21eaadc710fec2955af070bb52
2017-02-07 02:26:05 +00:00
Dan Willemsen
807f6927c7
Merge "Add USE_SOONG_UI to trigger soong_ui in Make mode"
...
am: 86a1c9f916
Change-Id: Icf0b6e6b2b4586a6fd5c9a0f9202b07c4e9f5938
2017-02-07 02:22:05 +00:00
Treehugger Robot
86a1c9f916
Merge "Add USE_SOONG_UI to trigger soong_ui in Make mode"
2017-02-07 02:14:16 +00:00
Dan Willemsen
3eb10cf6fa
Add USE_SOONG_UI to trigger soong_ui in Make mode
...
Test: USE_SOONG_UI=true m -j
Change-Id: Ic7a0b4e0881757b0324722d7d316fb8d13dabd9b
2017-02-06 15:04:40 -08:00
Colin Cross
b64f3908c1
Merge "Create static archives in temporary file" am: 2eca5d30df
am: 0cbb3086de
...
am: af87d8d1c5
Change-Id: Idc1fffd0c20dc1e667b974b558daf6770f1c3190
2017-02-06 21:28:46 +00:00
Colin Cross
af87d8d1c5
Merge "Create static archives in temporary file" am: 2eca5d30df
...
am: 0cbb3086de
Change-Id: Ie76b3d7395fd1fce54d35dcf98d9c3873fa359d8
2017-02-06 21:26:16 +00:00
Colin Cross
0cbb3086de
Merge "Create static archives in temporary file"
...
am: 2eca5d30df
Change-Id: I2231d9168cba51acae93adcad8aa793a1806e98e
2017-02-06 21:24:46 +00:00
Colin Cross
2eca5d30df
Merge "Create static archives in temporary file"
2017-02-06 21:19:22 +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
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
Tao Bao
2dd1c48377
releasetools: Pack the offset/length for metadata.
...
For streaming OTAs, we will also need the info in the metadata entry
(META-INF/com/android/metadata). Compute and pack its offset/length
values into 'ota-streaming-property-files'.
Bug: 34986195
Test: Create an OTA package and check the offset/length values.
Change-Id: Id150700f2bc9bff02467cda9fe8927c8a374412a
2017-02-03 16:50:25 -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
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
Colin Cross
e14d9b7f7e
Create static archives in temporary file
...
Creating static archives is often a multi-command process due to
adding whole static libraires or hitting command line length limits.
If one of the intermediate commands fails, the output file may
already exist. Unlike make, ninja has no option to delete output
files on failed builds, instead assuming all build commands will
produce their output file atomically
(https://github.com/ninja-build/ninja/issues/1135 ).
Change the static library rules to generate to a temporary file
that is then atomically moved into place as the output file.
Test: m -j checkbuild tests cts
Change-Id: I4faf269f0c8e313c738154870a5aa0b4774a72bc
2017-02-03 15:16:59 -08: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