Commit Graph

26540 Commits

Author SHA1 Message Date
Dan Willemsen 641e8888fa Merge "Remove changing uids/timestamps from zip/jar files" am: a0975edc16
am: c789be850c

* commit 'c789be850ca14b945e72412457991d7a5e13126e':
  Remove changing uids/timestamps from zip/jar files
2015-11-03 23:43:30 +00:00
Dan Willemsen c789be850c Merge "Remove changing uids/timestamps from zip/jar files"
am: a0975edc16

* commit 'a0975edc164f4ff248882e660d95802eabd72fd4':
  Remove changing uids/timestamps from zip/jar files
2015-11-03 21:47:30 +00:00
Dan Willemsen a0975edc16 Merge "Remove changing uids/timestamps from zip/jar files" 2015-11-03 21:38:45 +00:00
Ying Wang f0b5cd2de6 Merge "Don\'t check the host JDK tools when build/core/config.mk is called from envsetup.sh." am: a63d379aab am: fb89fd36b2
am: 88f5d25be1

* commit '88f5d25be1b0756db65b34114929b4dd0bc5f05c':
  Don't check the host JDK tools when build/core/config.mk is called from envsetup.sh.
2015-11-03 00:49:23 +00:00
Gaurav Shah 700911d027 Merge "envsetup,product,ninja: enable symlink traversal" am: f589c7b442 am: af80a461d6
am: 8b3e6b79ef

* commit '8b3e6b79ef9bb235264e3b2297d103ea7b89f38e':
  envsetup,product,ninja: enable symlink traversal
2015-11-03 00:49:16 +00:00
Gaurav Shah e5d70ac39a Merge "Support build targets with no installable apps/packages" am: aed6805380 am: 00b8cd9a15
am: 4b566a1d8b

* commit '4b566a1d8be4946cf0b756fe5a98af3ff57cb267':
  Support build targets with no installable apps/packages
2015-11-03 00:49:10 +00:00
Gaurav Shah 5af8f74bae Merge "build: Add extra build customization for /product" am: a80f1e3257 am: 64ea350dd8
am: 8e712959cf

* commit '8e712959cf8a8b9b454d1e50f960eef9d97cfbc9':
  build: Add extra build customization for /product
2015-11-03 00:49:03 +00:00
Gaurav Shah 01e0868d22 Merge "build: Add support for defining products in /product" am: acb8a7c1f8 am: 881ec090c4
am: 555489aa84

* commit '555489aa84954ff9de6e661169c5c0fe95f62c40':
  build: Add support for defining products in /product
2015-11-03 00:48:56 +00:00
Ying Wang 88f5d25be1 Merge "Don\'t check the host JDK tools when build/core/config.mk is called from envsetup.sh." am: a63d379aab
am: fb89fd36b2

* commit 'fb89fd36b21c557fa4873ad4c707f6dd07752ed0':
  Don't check the host JDK tools when build/core/config.mk is called from envsetup.sh.
2015-11-03 00:45:14 +00:00
Ying Wang fb89fd36b2 Merge "Don\'t check the host JDK tools when build/core/config.mk is called from envsetup.sh."
am: a63d379aab

* commit 'a63d379aab75fe3991320319f63faddd3b84b287':
  Don't check the host JDK tools when build/core/config.mk is called from envsetup.sh.
2015-11-03 00:40:38 +00:00
Ying Wang a63d379aab Merge "Don't check the host JDK tools when build/core/config.mk is called from envsetup.sh." 2015-11-03 00:17:43 +00:00
Ying Wang 7fcd2f9086 Don't check the host JDK tools when build/core/config.mk is called from envsetup.sh.
Envsetup.sh (lunch) relies on config.mk to get build varaible values; while
config.mk may rely on envsetup.sh to set up JAVA_HOME/PATH.
Without this change config.mk may be checking the host JDK tools before
JAVA_HOME/PATH get set up.

Change-Id: I1e6b5e33147258832ce2f0a425f9526ef4782c43
2015-11-02 16:00:47 -08:00
Dan Willemsen 48a621c277 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 tool, ziptime, that uses a very stripped down copy of
zipalign. It no longer depends on libandroidfw, and now rewrites the
timestamps in place instead of making a copy of the zipfile. This should
improve speed and reduce disk requirements, especially with the large
packaging zip files.

Bug: 24201956
Change-Id: I50f68669f659da1b4393e964ad40b6aafb00c1e7
2015-11-02 14:51:54 -08:00
Gaurav Shah 8b3e6b79ef Merge "envsetup,product,ninja: enable symlink traversal" am: f589c7b442
am: af80a461d6

* commit 'af80a461d6ae7d71a2e2976d96bb261cdb0eaed7':
  envsetup,product,ninja: enable symlink traversal
2015-11-02 22:30:17 +00:00
Gaurav Shah 4b566a1d8b Merge "Support build targets with no installable apps/packages" am: aed6805380
am: 00b8cd9a15

* commit '00b8cd9a15c81d2660e834a0290c00e6e22d2614':
  Support build targets with no installable apps/packages
2015-11-02 22:30:10 +00:00
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 af80a461d6 Merge "envsetup,product,ninja: enable symlink traversal"
am: f589c7b442

* commit 'f589c7b442feb02843bdf82305b599b686fc5204':
  envsetup,product,ninja: enable symlink traversal
2015-11-02 22:27:27 +00:00
Gaurav Shah 00b8cd9a15 Merge "Support build targets with no installable apps/packages"
am: aed6805380

* commit 'aed6805380810f51bb0d8b93fc5eac005a6de364':
  Support build targets with no installable apps/packages
2015-11-02 22:27:20 +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 f589c7b442 Merge "envsetup,product,ninja: enable symlink traversal" 2015-11-02 22:22:50 +00:00
Gaurav Shah aed6805380 Merge "Support build targets with no installable apps/packages" 2015-11-02 22:22:40 +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
Will Drewry c13f9c952d envsetup,product,ninja: enable symlink traversal
When searching device, product, or hardware, allow
find to follow symlinks.

Add KATI_EMULATE_FIND=false to allow disabling the find
emulator which changes findleaves.py behavior wrt
symlinks.

BUG=24605247
TEST=works with CL:783781 (without the find wrapper in that CL)

Change-Id: Ia9d0e4add391a56f34828a09a6cec3f435ccc548
2015-11-02 14:18:45 -08:00
Gaurav Shah 67c2ed390f Support build targets with no installable apps/packages
Specifically, do not error out if no installable apps are found.

- When creating an archive of all the apps, and if no apps exist
for the target, generate an empty archive file.
- If building for a target with no installable jar(s) or apk(s),
generate an empty package stats file.

The former is just an output artifact. The latter is used
by the upload_pkg_stats.py script which correctly handles
an empty input file.

BUG: 23421592

Change-Id: I48db9f9e1f61914d8fd938130e09b41849685450
2015-11-02 14:18:30 -08: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 4e8e26819e Merge "Add _asan suffix to ro.build.flavor for ASAN builds." am: f0a8dd43b2 am: cce30b6daa
am: 5d95b4aa93

* commit '5d95b4aa935e37fee0f68a97953c6e440974af0d':
  Add _asan suffix to ro.build.flavor for ASAN builds.
2015-11-02 20:01:16 +00:00
Ying Wang 8ef7a895da Merge "Fix "make product-graph" and "make dump-products"." am: 888f30aa44 am: 603e4ed594
am: 6a019f1d2e

* commit '6a019f1d2ec88baeaa5c95c76ea966e562bdfa3a':
  Fix "make product-graph" and "make dump-products".
2015-11-02 20:01:10 +00: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
Chris Palmer 49e300d54f Merge "Make URLs either HTTPS or protocol-relative." 2015-10-30 20:28:51 +00:00
Dan Willemsen bfaf0f7830 Merge "Revert "Remove changing uids/timestamps from zip/jar files"" am: 49d8c5196e am: d8d06da814
am: 5887bfbe20

* commit '5887bfbe203d47849993b3cdbe54d6f0a155a071':
  Revert "Remove changing uids/timestamps from zip/jar files"
2015-10-29 21:42:07 +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 81e5f37786 Merge "Remove changing uids/timestamps from zip/jar files" am: 9f25219371 am: a51b1d532e
am: aa851650bf

* commit 'aa851650bf73d8143da011013bd64cd49969be96':
  Remove changing uids/timestamps from zip/jar files
2015-10-29 19:20:55 +00:00
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
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