Commit Graph

22055 Commits

Author SHA1 Message Date
Chris Elliott
a0cca8e66a am 1e253e76: (-s ours) Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev
* commit '1e253e76b9f0fcc92769b3dd02c8ffc8cc30520d':
  DO NOT MERGE Fix the syntax error in the edify script generator
2015-07-02 22:36:55 +00:00
Chris Elliott
1e253e76b9 Merge "DO NOT MERGE Fix the syntax error in the edify script generator" into cw-d-mr1-dev 2015-07-02 20:18:35 +00:00
Tao Bao
4dacce92ce DO NOT MERGE Fix the syntax error in the edify script generator
file_getprop() always expects two arguments.

Bug: 19881931
Change-Id: Icf5577ad34188991c03f68c1217642d3adc4201c
2015-07-02 13:17:21 -07:00
Tao Bao
41bcf3e425 Fix build.
Change-Id: Id3eb4821a3c3061063a00294bfa268693c773eb8
2015-07-01 19:38:34 -07:00
Tao Bao
608d9d2452 am 1aa1af0e: sparse_img.py: Don\'t write empty map groups.
* commit '1aa1af0e997699bc025e4f0a754692068328d7e6':
  sparse_img.py: Don't write empty map groups.
2015-07-02 00:47:51 +00:00
Simon Wilson
e416a41f3a am 16401ad4: Revert "sparse_img.py: Don\'t write empty map groups."
* commit '16401ad4256178fbe7a2cd8588e6dbf9a6c63180':
  Revert "sparse_img.py: Don't write empty map groups."
2015-07-02 00:47:50 +00:00
Tao Bao
8787cd6d4e resolved conflicts for merge of 7f9470cd to lmp-mr1-ub-dev
Change-Id: Icfc94fcc4178f5fbfad62df9914c84d59d140bb7
2015-07-01 17:44:53 -07:00
Tao Bao
1aa1af0e99 sparse_img.py: Don't write empty map groups.
In certain cases, we may have no mapping of ZERO or NONZERO blocks in
the image (such as squashfs at the moment). Don't write those groups if
they are empty.

Change-Id: I4a1f0105ada2e1573c3d6162457b83725e0d8971
2015-07-01 11:24:30 -07:00
Simon Wilson
16401ad425 Revert "sparse_img.py: Don't write empty map groups."
This reverts commit 7f9470cda3.

Change-Id: I97e2859903fbc4f1e6f0824269ae88b23f63e032
2015-07-01 18:10:28 +00:00
Tao Bao
7f9470cda3 sparse_img.py: Don't write empty map groups.
In certain cases, we may have no mapping of ZERO or NONZERO blocks in
the image (such as squashfs at the moment). Don't write those groups if
they are empty.

Change-Id: I82aa05fbbd79130b08868585edd5298e531c4f5a
2015-07-01 10:10:31 -07:00
Ying Wang
78d1cba0f4 Fix conflict resolving error in ef5dc90bba
Change-Id: Ib561c8dec3bbd605007b46b8520f12d6e3e2db90
2015-06-26 14:06:32 -07:00
Mohamad Ayyash
1a4658cd3b resolved conflicts for merge of ef5dc90b to lmp-mr1-ub-dev 2015-06-24 16:54:12 -07:00
Mohamad Ayyash
ef5dc90bba Add img2simg in host and ota packages
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 16:13:07 -07:00
Mohamad Ayyash
48cb24a655 am 648e40e8: build_image.py: Make sparse squashfs images
* commit '648e40e8660135f37adad5981a48250476c2f3fd':
  build_image.py: Make sparse squashfs images
2015-06-24 22:52:10 +00:00
Simon Wilson
ecfc97f772 resolved conflicts for merge of f86e7eea to lmp-mr1-ub-dev
Change-Id: I746021aa57edd5f6fae6e57cec0908951a659664
2015-06-24 15:42:27 -07:00
Mohamad Ayyash
9ca7fa8993 resolved conflicts for merge of 1b748051 to lmp-mr1-ub-dev 2015-06-24 15:04:38 -07:00
Mohamad Ayyash
648e40e866 build_image.py: Make sparse squashfs images
Change-Id: Iea0399868a9406f9929d8176d61d5698a2043697
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 10:54:16 -07:00
Mohamad Ayyash
f35ed6bd84 resolved conflicts for merge of cade49dd to lmp-mr1-ub-dev 2015-06-23 16:22:32 -07:00
Simon Wilson
f86e7eeabc Add compressor options for squashfs system images
Change-Id: I2a75f8754273f6e00b96ba6aca6741c4388f5da8
2015-06-22 15:42:52 -07:00
David Friedman
552de126e9 am 42c75239: Merge "Docs: Fixing disappearance of the left-navs in NDK minisite." into mnc-preview-docs
* commit '42c752392ceea6854c423339eedede6f4fdf6696':
  Docs: Fixing disappearance of the left-navs in NDK minisite.
2015-06-17 21:57:47 +00:00
David Friedman
42c752392c Merge "Docs: Fixing disappearance of the left-navs in NDK minisite." into mnc-preview-docs 2015-06-17 21:51:07 +00:00
David Friedman
c997cf910b Docs: Fixing disappearance of the left-navs in NDK minisite.
When the filepath changed from html-ndk/ndk/ to html/ndk, the build
system could no longer find the _toc files. This change fixes that issue.

Change-Id: I51f19159e6636fb90ed04013b11d7f95fb4e04c3
2015-06-17 14:36:05 -07:00
Mohamad Ayyash
1b748051dd common.py: Add support for squashfs
Change-Id: Ia40f8c6307d0213d43207aee91c4c8a5b5ad6f1e
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-16 13:18:44 -07:00
Mohamad Ayyash
cade49ddee Allow flashing a squashfs system image
Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-16 13:11:21 -07:00
C. Sean Young
cbaead4cfe am 540772fa: am cf469989: Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
* commit '540772fa2287e63a0c745229fb72b78903c9cd70':
  Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
2015-06-12 16:29:25 +00:00
C. Sean Young
540772fa22 am cf469989: Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
* commit 'cf4699895ad99b83a24e376007750e2c2c0502f6':
  Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
2015-06-10 18:38:46 +00:00
C. Sean Young
cf4699895a Add new variable SCAN_EXCLUDE_DIRS; specifies directories to exclude when searching source tree.
These directories are excluded in addition to OUT_DIR.
This can be useful if your build system has other output directories
beyond what OUT_DIR is set to.

Change-Id: I6d98a85bcc8c89279e939406a7fec32547e8922f
2015-06-10 13:00:13 -05:00
Luan Nguyen
30b16ac6a4 am 95a1818f: Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs
* commit '95a1818f50c685f903635ae84076199015cc9c78':
  docs: Add styles for embedded videos to match DevSite
2015-06-03 18:25:23 +00:00
Luan Nguyen
95a1818f50 Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs 2015-06-03 18:13:17 +00:00
Luan Nguyen
94c1826a72 docs: Add styles for embedded videos to match DevSite
Change-Id: I68cc9a7340db43fd23d7072bf867d53a2e180c4c
2015-06-03 09:56:54 -07:00
Dirk Dougherty
f89524c80b am 6c231420: Merge "increment metadata versions." into mnc-preview-docs
* commit '6c2314206fd4500500062fa2f774d4deb498ec58':
  increment metadata versions.
2015-05-28 21:24:53 +00:00
Dirk Dougherty
6c2314206f Merge "increment metadata versions." into mnc-preview-docs 2015-05-28 21:07:43 +00:00
Dirk Dougherty
81e39c3e9d increment metadata versions.
Change-Id: I6e620f7ec2059ed864ebaad68585c4f97e2caf46
2015-05-28 14:06:12 -07:00
Dirk Dougherty
fa370efd83 am 11d3d486: Increment css versions for appengine\'s benefit.
* commit '11d3d4864d1efc588b2291ac5087ff94ba34b2a1':
  Increment css versions for appengine's benefit.
2015-05-28 20:08:34 +00:00
Dirk Dougherty
11d3d4864d Increment css versions for appengine's benefit.
Change-Id: I2fd9bff3a537904cc47273c0eedcc33ea301a4a0
2015-05-28 12:50:24 -07:00
Dirk Dougherty
ab6b54b874 am 3d05504e: Merge "Add download button disabled state to sdk css." into mnc-preview-docs
* commit '3d05504e2d4091854c2ec1af06de8c54429ca1fc':
  Add download button disabled state to sdk css.
2015-05-28 07:21:44 +00:00
Dirk Dougherty
3d05504e2d Merge "Add download button disabled state to sdk css." into mnc-preview-docs 2015-05-28 07:07:47 +00:00
Joe Fernandez
b9bc5726c3 am 52d8d3d3: docs: Increment all JS resource references to force refresh
* commit '52d8d3d3eda6dd9cc261528e804c105bd3fbc654':
  docs: Increment all JS resource references to force refresh
2015-05-28 01:47:05 +00:00
Joe Fernandez
52d8d3d3ed docs: Increment all JS resource references to force refresh
b/21462060

Change-Id: I6335bb8b7ae754af50719a64c8cf7b53c4b51421
2015-05-27 18:22:00 -07:00
Dirk Dougherty
6e46b3185b Add download button disabled state to sdk css.
Change-Id: Iba634208bdc8cf62532f35fb00c640e3f4e59311
2015-05-27 18:18:20 -07:00
Ying Wang
b5f5937280 am 30a411f0: am 58b3ee28: am 12f44975: Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
* commit '30a411f0f61dd74fb870fb97b8d2129dbfb85024':
  Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
2015-05-27 23:24:19 +00:00
Ying Wang
30a411f0f6 am 58b3ee28: am 12f44975: Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
* commit '58b3ee286363ee37f8f0bb84f6acefaf96102fef':
  Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
2015-05-27 22:48:45 +00:00
Ying Wang
58b3ee2863 am 12f44975: Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
* commit '12f449756587b83cd6a04c793e05b837ceb41563':
  Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
2015-05-27 22:32:41 +00:00
Ying Wang
12f4497565 Strip LOCAL_STATIC_JAVA_AAR_LIBRARIES
Change-Id: I0a0c4fe0cdd9c162976ef5f4c4709d400fde2d5a
2015-05-27 15:14:28 -07:00
Dirk Dougherty
26300a8b91 am 825c1aa1: Highlight Essentials tab for distribute/tools content.
* commit '825c1aa1a7bfe69f6d7e15e76b8eb2be96ddc20c':
  Highlight Essentials tab for distribute/tools content.
2015-05-26 21:58:39 +00:00
Dirk Dougherty
825c1aa1a7 Highlight Essentials tab for distribute/tools content.
Change-Id: I8cc4a73dc1b507940d02b8e40e03aed966ab44b0
2015-05-26 14:45:09 -07:00
Dirk Dougherty
faa0de643c am abb97087: update logo icons for sdk/ndk.
* commit 'abb9708756d7d8e7eb355c8982174fc8457bb202':
  update logo icons for sdk/ndk.
2015-05-25 22:28:00 +00:00
Dirk Dougherty
abb9708756 update logo icons for sdk/ndk.
Change-Id: Icb8f3d6e0bbc8b00881b7b2dc705bae5ac70a4a0
2015-05-25 15:15:46 -07:00
Yigit Boyar
b3b3add1d7 am 10380bc7: (-s ours) Merge "DO NOT MERGE Remove RecyclerView tests form pathmap" into mnc-preview-docs
* commit '10380bc773934e1ba14964731e30b69f251c3afc':
  DO NOT MERGE Remove RecyclerView tests form pathmap
2015-05-22 23:34:49 +00:00
Yigit Boyar
10380bc773 Merge "DO NOT MERGE Remove RecyclerView tests form pathmap" into mnc-preview-docs 2015-05-22 23:22:20 +00:00