p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
25,692 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

25692 Commits

Author SHA1 Message Date
Gaurav Shah 8e712959cf Merge "build: Add extra build customization for /product" am: a80f1e3257 
am: 64ea350dd8

* commit '64ea350dd8c2d2b1dc73f753c0bad8e98e12c511':
  build: Add extra build customization for /product
 2015-11-02 22:30:03 +00:00
Gaurav Shah 555489aa84 Merge "build: Add support for defining products in /product" am: acb8a7c1f8 
am: 881ec090c4

* commit '881ec090c4790bdd588048f17038d167d7b52d87':
  build: Add support for defining products in /product
 2015-11-02 22:29:57 +00:00
Gaurav Shah 64ea350dd8 Merge "build: Add extra build customization for /product" 
am: a80f1e3257

* commit 'a80f1e32575db5d66f4b4e6efdf79dd10dd2295e':
  build: Add extra build customization for /product
 2015-11-02 22:27:14 +00:00
Gaurav Shah 881ec090c4 Merge "build: Add support for defining products in /product" 
am: acb8a7c1f8

* commit 'acb8a7c1f8cacaf136edba1a25d64467d352a432':
  build: Add support for defining products in /product
 2015-11-02 22:27:08 +00:00
Gaurav Shah a80f1e3257 Merge "build: Add extra build customization for /product" 2015-11-02 22:22:32 +00:00
Gaurav Shah acb8a7c1f8 Merge "build: Add support for defining products in /product" 2015-11-02 22:22:22 +00:00
Lee Campbell 04ba31236e build: Add extra build customization for /product 
This makes /product more consistent with /device & /vendor

BUG: 22030305

Change-Id: Ic65bfde7fb3e9fab8c8fb8d99af15404574abde0
 2015-11-02 14:18:13 -08:00
Lee Campbell 455f6f458d build: Add support for defining products in /product 
The build will now search for AndroidProducts.mk in /product

BUG: 22030305

Change-Id: I2d067d95d0c8dc1341a55167f9ac7f6926e04ce3
 2015-11-02 14:17:47 -08:00
Ying Wang 5d95b4aa93 Merge "Add _asan suffix to ro.build.flavor for ASAN builds." am: f0a8dd43b2 
am: cce30b6daa

* commit 'cce30b6daae84f194a3d71a1e7c452345999c925':
  Add _asan suffix to ro.build.flavor for ASAN builds.
 2015-11-02 19:55:12 +00:00
Ying Wang 6a019f1d2e Merge "Fix "make product-graph" and "make dump-products"." am: 888f30aa44 
am: 603e4ed594

* commit '603e4ed594b99b9463a9a67c1f7ba91b2967025e':
  Fix "make product-graph" and "make dump-products".
 2015-11-02 19:55:06 +00:00
Ying Wang cce30b6daa Merge "Add _asan suffix to ro.build.flavor for ASAN builds." 
am: f0a8dd43b2

* commit 'f0a8dd43b26d49ad67e2c6c8c936e64a62df8582':
  Add _asan suffix to ro.build.flavor for ASAN builds.
 2015-11-02 19:52:04 +00:00
Ying Wang 603e4ed594 Merge "Fix "make product-graph" and "make dump-products"." 
am: 888f30aa44

* commit '888f30aa448370206a49ff7df940e134b8ff7017':
  Fix "make product-graph" and "make dump-products".
 2015-11-02 19:51:57 +00:00
Ying Wang f0a8dd43b2 Merge "Add _asan suffix to ro.build.flavor for ASAN builds." 2015-11-02 19:47:31 +00:00
Ying Wang 888f30aa44 Merge "Fix "make product-graph" and "make dump-products"." 2015-11-02 19:46:53 +00:00
Dan Willemsen 5887bfbe20 Merge "Revert "Remove changing uids/timestamps from zip/jar files"" am: 49d8c5196e 
am: d8d06da814

* commit 'd8d06da814fa02413bc3e58f3047f9a2ab61bb09':
  Revert "Remove changing uids/timestamps from zip/jar files"
 2015-10-29 21:38:10 +00:00
Dan Willemsen d8d06da814 Merge "Revert "Remove changing uids/timestamps from zip/jar files"" 
am: 49d8c5196e

* commit '49d8c5196eb690fc987673c27cb61087c5886be4':
  Revert "Remove changing uids/timestamps from zip/jar files"
 2015-10-29 21:33:39 +00:00
Dan Willemsen 49d8c5196e Merge "Revert "Remove changing uids/timestamps from zip/jar files"" 2015-10-29 21:28:17 +00:00
Dan Willemsen b589ae4e26 Revert "Remove changing uids/timestamps from zip/jar files" 
This reverts commit 3c2c064c87.

zipalign depends on libandroidfw, and some setups don't include frameworks/base.

Bug: 24201956
Change-Id: I48ee95808924f6b2221f0a49ab205c2565096b1f
 2015-10-29 21:26:18 +00:00
Dan Willemsen aa851650bf Merge "Remove changing uids/timestamps from zip/jar files" am: 9f25219371 
am: a51b1d532e

* commit 'a51b1d532e998c1668fd991f53c6619e02d9338a':
  Remove changing uids/timestamps from zip/jar files
 2015-10-29 19:15:52 +00:00
Dan Willemsen a51b1d532e Merge "Remove changing uids/timestamps from zip/jar files" 
am: 9f25219371

* commit '9f252193714c82dbce702e8055ffaa7eec4afe66':
  Remove changing uids/timestamps from zip/jar files
 2015-10-29 19:12:37 +00:00
Dan Willemsen 9f25219371 Merge "Remove changing uids/timestamps from zip/jar files" 2015-10-29 19:07:36 +00:00
Dan Willemsen 3c2c064c87 Remove changing uids/timestamps from zip/jar files 
Pass -X to zip so that Unix UID/GID and extra timestamps aren't
saved into the zip files.

Add a new option to zipalign, -t, to replace all timestamps with static
timestamps (2008 Jan 1 00:00:00). Use this for all non-APK zip files.
APK zip timestamps are set based on the certificate date in SignApk.

Bug: 24201956
Change-Id: Ifb619fc499ba9d99fc624f2acd5f8de36d78ef8e
 2015-10-29 11:57:16 -07: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 21ec03d186 Add _asan suffix to ro.build.flavor for ASAN builds. 
Bug: 25344475
Change-Id: I27f2472906631239ca725ee09da2ab791cad2195
 2015-10-28 18:47:00 -07: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 67132baa4d Fix "make product-graph" and "make dump-products". 
- For unmodified "make product-graph" and "make dump-products",
  load only the current product configuration makefiles. This is much
  faster than loading all product makefiles.
- For "make product-graph ANDROID_PRODUCT_GRAPH=--all",
  "make dump-products ANDROID_DUMP_PRODUCTS=all", load all product
  makefiles.
- Move product-graph.mk out of build tasks, so we can skip loading all
  the Android.mks, which takes long and we don't really need them.
  More importantly, with all product makefiles loaded, modules in
  Android.mks are prone to clash (if they are conditionally included
  by variables set up in product makefiles) and lead to parse-time
  error.

Change-Id: Idc1d6b0c23eb2c8bb34fdd7a1fa4d56171768d21
 2015-10-28 16:49:44 -07: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 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
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 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