StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,489 Commits 1 Branch 0 Tags
a76a06e05e588b18cdc77dfec05ec1c3758fe95f
Commit Graph

26489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao
a76a06e05e Merge "Honor TARGET_NO_RECOVERY flag." am: c448e91c3d am: e5eb4567d4 
am: b7e92cf344

* commit 'b7e92cf344c54af39d44905d5d8a4d9d79f6a5c4':
  Honor TARGET_NO_RECOVERY flag.
 2015-10-29 19:20:49 +00:00
Sami Tolvanen
6c0477429b Merge "Error correction: Use block_image_recover in block OTAs" am: fe4e86c7fd am: a25cced65f 
am: bc946c6521

* commit 'bc946c65213a131d672f0f897989d71177d32ea4':
  Error correction: Use block_image_recover in block OTAs
 2015-10-29 19:20:42 +00:00
Tao Bao
b7e92cf344 Merge "Honor TARGET_NO_RECOVERY flag." am: c448e91c3d 
am: e5eb4567d4

* commit 'e5eb4567d408808873d7193fcaf7bfea859ea725':
  Honor TARGET_NO_RECOVERY flag.
 2015-10-29 16:49:53 +00:00
Sami Tolvanen
bc946c6521 Merge "Error correction: Use block_image_recover in block OTAs" am: fe4e86c7fd 
am: a25cced65f

* commit 'a25cced65f3418b86ba7c3707f29838f4794f8b6':
  Error correction: Use block_image_recover in block OTAs
 2015-10-29 16:49:37 +00:00
Tao Bao
e5eb4567d4 Merge "Honor TARGET_NO_RECOVERY flag." 
am: c448e91c3d

* commit 'c448e91c3d3d095f8f200c9925f7db2ad525132f':
  Honor TARGET_NO_RECOVERY flag.
 2015-10-29 16:45:31 +00:00
Sami Tolvanen
a25cced65f Merge "Error correction: Use block_image_recover in block OTAs" 
am: fe4e86c7fd

* commit 'fe4e86c7fd1b9c8903fda194b8515451c477ced9':
  Error correction: Use block_image_recover in block OTAs
 2015-10-29 16:45:14 +00:00
Tao Bao
c448e91c3d Merge "Honor TARGET_NO_RECOVERY flag." 2015-10-29 16:13:52 +00:00
Sami Tolvanen
fe4e86c7fd Merge "Error correction: Use block_image_recover in block OTAs" 2015-10-29 16:05:46 +00:00
Sami Tolvanen
f0a7c76b45 Error correction: Use block_image_recover in block OTAs 
If block_image_verify fails, attempt to recover using FEC before giving up.

Bug: 21893453
Change-Id: Ibc1fe5d28b2a8099d2b5094277b572ec08229c3a
 2015-10-29 11:39:31 +00:00
Ying Wang
471bf958cd Merge "Normalize the product makefile path in inherit-product." am: aabff90bfe am: 3482ea54a2 
am: 4f5e8cc3ca

* commit '4f5e8cc3ca6da83f11bf42d04f1a57b9af16a582':
  Normalize the product makefile path in inherit-product.
 2015-10-29 00:02:58 +00:00
Ying Wang
4f5e8cc3ca Merge "Normalize the product makefile path in inherit-product." am: aabff90bfe 
am: 3482ea54a2

* commit '3482ea54a2fecc756c79a94f37a66113d21d7558':
  Normalize the product makefile path in inherit-product.
 2015-10-28 23:59:12 +00:00
Ying Wang
3482ea54a2 Merge "Normalize the product makefile path in inherit-product." 
am: aabff90bfe

* commit 'aabff90bfe2312a95d3cf57564845fef8dc469a2':
  Normalize the product makefile path in inherit-product.
 2015-10-28 23:55:10 +00:00
Ying Wang
aabff90bfe Merge "Normalize the product makefile path in inherit-product." 2015-10-28 23:51:57 +00:00
Ying Wang
a174261042 Normalize the product makefile path in inherit-product. 
Some vendor product makefiles call $(inherit-product) on the same
product makefile with different paths, by using "../" in relative paths.
However inherit-product requires unique path as ID for a product
makefile, for bookkeeping purpose.
Normalize the product makefile path in inherit-product, if the path
contains "../".

Change-Id: I1a864ce120c713d8e79ec179213b9fc9352aba53
 2015-10-28 15:20:41 -07:00
Colin Cross
cfb21b2be3 Merge "Remove use of .INTERMEDIATE" am: dda5e96b14 am: 24ef58d163 
am: 0dc087dff7

* commit '0dc087dff769ef5b1d44ad1f2e0f36cb053867a9':
  Remove use of .INTERMEDIATE
 2015-10-28 21:20:09 +00:00
Colin Cross
0dc087dff7 Merge "Remove use of .INTERMEDIATE" am: dda5e96b14 
am: 24ef58d163

* commit '24ef58d1638716c1fdbc130e6cf871d052e9d672':
  Remove use of .INTERMEDIATE
 2015-10-28 21:15:27 +00:00
Colin Cross
24ef58d163 Merge "Remove use of .INTERMEDIATE" 
am: dda5e96b14

* commit 'dda5e96b144c15a75d625ceac7e92b50cf9c363a':
  Remove use of .INTERMEDIATE
 2015-10-28 21:12:02 +00:00
Colin Cross
dda5e96b14 Merge "Remove use of .INTERMEDIATE" 2015-10-28 21:09:05 +00:00
Colin Cross
42470e915d Remove use of .INTERMEDIATE 
make 3.81 has a bug where combining an up-to-date .INTERMEDIATE rule
with -j causes an infinite loop (http://savannah.gnu.org/bugs/?15919).
.INTERMEDIATE was only necessary to support multiple outputs while only
running a command once, remove .INTERMEDIATE by replacing
$(KATI_OUTPUTS) dependencies with $(KATI_BUILD_NINJA).  We can assume
that $(KATI_NINJA_SH) will be updated at the same time as
$(KATI_BUILD_NINJA), and not explicitly depend on it.

Also remove generateonly and fastincremental, which are no longer
necessary and were overcomplicating ninja.mk.  kati now always runs due
to FORCE, and ninja is run by a phony rule that depends on
$(KATI_BUILD_NINJA).

Bug: 25344116
Change-Id: I99d2713b1532ea11d83da9a11b1be26cfe13a5d2
 2015-10-28 13:31:40 -07:00
Marco Nelissen
6c5754a93f Merge "Add extractorservice executable to base config" 2015-10-28 17:30:40 +00:00
Tao Bao
db45efa647 Honor TARGET_NO_RECOVERY flag. 
Don't generate recovery.img when calling 'make dist' if
TARGET_NO_RECOVERY is set. The build system passes the flag to the
packaging script which then generates recovery.img conditionally.

Bug: 25329471
Change-Id: Ifbc999300d5c31e897878f81e231ae7dd2aca660
 2015-10-27 20:00:10 -07:00
Chih-hung Hsieh
d1e932e91e Merge "Move arm64 target to clang by default." am: befb82f204 am: b7ad8778cd 
am: 72d90d25d0

* commit '72d90d25d028f62b584cfdaa3c2c7fba68ed74d4':
  Move arm64 target to clang by default.
 2015-10-28 01:46:34 +00:00
Chih-Hung Hsieh
07be5025d9 resolve merge conflicts of b5775d97b4 to master. 
Change-Id: I99fda2935ab74e0634c1aa4905ce4da693e96cb6
 2015-10-27 16:48:38 -07:00
Colin Cross
a9373f8e24 Merge "Error out early on nonstandard JDK directory layouts" am: 506113d267 am: e95cf75293 
am: 1ac51c013e

* commit '1ac51c013e134c7a22580f9020e3b89851153a7e':
  Error out early on nonstandard JDK directory layouts
 2015-10-27 23:27:47 +00:00
Chih-hung Hsieh
72d90d25d0 Merge "Move arm64 target to clang by default." am: befb82f204 
am: b7ad8778cd

* commit 'b7ad8778cd054932a6f85bd9b3a010767ffbec04':
  Move arm64 target to clang by default.
 2015-10-27 23:20:46 +00:00
Chih-hung Hsieh
b5775d97b4 Merge "Move arm target to clang by default." am: 873d394c54 
am: 639ab89a11

* commit '639ab89a1183b91e40bb0d4f82cda61962635849':
  Move arm target to clang by default.
 2015-10-27 23:20:37 +00:00
Chih-hung Hsieh
b7ad8778cd Merge "Move arm64 target to clang by default." 
am: befb82f204

* commit 'befb82f20429b469aaebf6c8e7d0a2c4a0d414e3':
  Move arm64 target to clang by default.
 2015-10-27 23:12:23 +00:00
Chih-hung Hsieh
639ab89a11 Merge "Move arm target to clang by default." 
am: 873d394c54

* commit '873d394c543e2d0ac96736db77b88e41acb5bc36':
  Move arm target to clang by default.
 2015-10-27 23:12:13 +00:00
Chih-hung Hsieh
befb82f204 Merge "Move arm64 target to clang by default." 2015-10-27 23:02:26 +00:00
Chih-hung Hsieh
873d394c54 Merge "Move arm target to clang by default." 2015-10-27 23:02:10 +00:00
Chih-Hung Hsieh
cf67f13792 Move arm64 target to clang by default. 
Bug: 23163853
Change-Id: I59c311f552ca060bc7bd034fa4f1c03eb24802d5
 2015-10-27 13:44:53 -07:00
Chih-Hung Hsieh
557fa2f3cd Move arm target to clang by default. 
Bug: 23163853
Change-Id: I4cb95ed652ca697461e2fb22811779aa2df8d262
 2015-10-27 13:42:34 -07:00
Colin Cross
1ac51c013e Merge "Error out early on nonstandard JDK directory layouts" am: 506113d267 
am: e95cf75293

* commit 'e95cf75293c7111957229ae898ad1afd453ead50':
  Error out early on nonstandard JDK directory layouts
 2015-10-27 19:22:07 +00:00
Colin Cross
e95cf75293 Merge "Error out early on nonstandard JDK directory layouts" 
am: 506113d267

* commit '506113d2671e8f3dd5a46b63b7996accec6acb35':
  Error out early on nonstandard JDK directory layouts
 2015-10-27 19:17:38 +00:00
Colin Cross
506113d267 Merge "Error out early on nonstandard JDK directory layouts" 2015-10-27 19:12:40 +00:00
Ying Wang
3d77b98d57 Merge "Revert "Enable gold linker for aarch64."" am: edfa0981c9 am: 5eccb209d0 
am: fd06048887

* commit 'fd06048887e75a87e900ac56aa174cbb5f5d27d8':
  Revert "Enable gold linker for aarch64."
 2015-10-27 19:01:15 +00:00
Ying Wang
fd06048887 Merge "Revert "Enable gold linker for aarch64."" am: edfa0981c9 
am: 5eccb209d0

* commit '5eccb209d06bcc9c7502d5767dbc6c9e2fc7f8c5':
  Revert "Enable gold linker for aarch64."
 2015-10-27 18:55:19 +00:00
Ying Wang
5eccb209d0 Merge "Revert "Enable gold linker for aarch64."" 
am: edfa0981c9

* commit 'edfa0981c958453215fbbfccdcf6d05662cf9583':
  Revert "Enable gold linker for aarch64."
 2015-10-27 18:49:07 +00:00
Ying Wang
edfa0981c9 Merge "Revert "Enable gold linker for aarch64."" 2015-10-27 18:36:47 +00:00
Dan Albert
e4256f5759 Revert "Enable gold linker for aarch64." 
Causes build failures on Darwin.

prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9/aarch64-linux-android/bin/ld.gold: warning: cannot scan executable section 5 of out/target/product/flounder/obj/SHARED_LIBRARIES/libdl_intermediates/libdl.o for Cortex-A53 erratum because it has no mapping symbols.

prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9/aarch64-linux-android/bin/ld.gold: warning: cannot scan executable section 8 of out/target/product/flounder/obj/SHARED_LIBRARIES/libdl_intermediates/libdl.o for Cortex-A53 erratum because it has no mapping symbols.

prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9/aarch64-linux-android/bin/ld.gold: warning: cannot scan executable section 11 of out/target/product/flounder/obj/SHARED_LIBRARIES/libdl_intermediates/libdl.o for Cortex-A53 erratum because it has no mapping symbols.

prebuilts/gcc/darwin-x86/aarch64/aarch64-linux-android-4.9/aarch64-linux-android/bin/ld.gold: error: treating warnings as errors

This reverts commit 127d110172.

Change-Id: I1d3de90f5ae777b66a8f94fbcc9ccde8a9e3001c
 2015-10-27 18:18:46 +00:00
Marco Nelissen
469a926e7f Add extractorservice executable to base config 
Change-Id: I0ffbe183decfd76be681e08b8627c3d789c4b916
 2015-10-27 10:28:00 -07:00
Zach Jang
2e21ec1c7a Merge "Update security string to 2015-12-01" into mnc-dev am: 54cb940c4a am: dfd3524f7b am: eca2b655e5 am: e23d93a7f2 
am: 6e32e64077

* commit '6e32e6407720944125b941ea651b2bc03c5b67b0':
  Update security string to 2015-12-01
 2015-10-27 00:58:58 +00:00
Zach Jang
6e32e64077 Merge "Update security string to 2015-12-01" into mnc-dev am: 54cb940c4a am: dfd3524f7b am: eca2b655e5 
am: e23d93a7f2

* commit 'e23d93a7f2a0d6e0da12123dc8ed6f2e65bd805c':
  Update security string to 2015-12-01
 2015-10-27 00:55:45 +00:00
Zach Jang
e23d93a7f2 Merge "Update security string to 2015-12-01" into mnc-dev am: 54cb940c4a am: dfd3524f7b 
am: eca2b655e5

* commit 'eca2b655e5a57f0a13c55d815f6b18d8d03160fb':
  Update security string to 2015-12-01
 2015-10-27 00:52:13 +00:00
Zach Jang
eca2b655e5 Merge "Update security string to 2015-12-01" into mnc-dev am: 54cb940c4a 
am: dfd3524f7b

* commit 'dfd3524f7b1fb2f0346eee7fa0dc42e8888f68aa':
  Update security string to 2015-12-01
 2015-10-27 00:48:30 +00:00
Zach Jang
dfd3524f7b Merge "Update security string to 2015-12-01" into mnc-dev 
am: 54cb940c4a

* commit '54cb940c4a07701212e96f77ee4a89493b0f251b':
  Update security string to 2015-12-01
 2015-10-27 00:44:56 +00:00
Zach Jang
54cb940c4a Merge "Update security string to 2015-12-01" into mnc-dev 2015-10-27 00:37:40 +00:00
Ying Wang
a180348db3 Merge "Strip LOCAL_MODULE before referencing it." am: 411b2f90a9 am: fbb85a95b5 
am: 86a7c218e0

* commit '86a7c218e02e59810525f28da9b81eca4390bbbf':
  Strip LOCAL_MODULE before referencing it.
 2015-10-27 00:22:37 +00:00
Ying Wang
86a7c218e0 Merge "Strip LOCAL_MODULE before referencing it." am: 411b2f90a9 
am: fbb85a95b5

* commit 'fbb85a95b5d1089c335106c33ce3613e3e39702a':
  Strip LOCAL_MODULE before referencing it.
 2015-10-27 00:16:05 +00:00
Ying Wang
fbb85a95b5 Merge "Strip LOCAL_MODULE before referencing it." 
am: 411b2f90a9

* commit '411b2f90a95e5a471f248ec769826cf22dd12296':
  Strip LOCAL_MODULE before referencing it.
 2015-10-27 00:12:53 +00:00