aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-11-21Merge changes from topic "multi-suite-dev" into nougat-cts-devnougat-cts-devTreehugger Robot
* changes: Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase directories. Update CleanSpec.mk for the common testcase directories. Output *TS testcases to their own subdir in the common testcase folders. Output *TS testcases to common testcase folders.
2017-11-01Add support for multiple LOCAL_COMPATIBILITY_SUITES & undefined testcase ↵Simran Basi
directories. 1) Updates the LOCAL_COMPATIBILITY_SUITE line to allow for a testcase to belong to multiple suites. 2) Building testcases no longer fails if COMPATIBILITY_TESTCASES_OUT_<suite> is not defined. This testcase will just not output to that directory. This will be utilized by the device-tests and general-tests suites that don't require any extra output besides the common testcase directory. Bug: 35394351 Test: 1) Added multiple *TS testcases to cts & vts and verified they ended up in the common directory and each suite's testcase directory. Specifically tested CtsSplitApp to ensure the split usecase still works as well. 2) Added a CTS testcase to the device-tests suite, built device-tests and verified the cts/android-cts/testcases copy was not produced. Change-Id: Ic4c4e87e62be4fc0c5e394d88cc359518346dffa (cherry picked from commit 6bea37c7fa775e5aa729d1c4f8792b39e9e7aaba) Merged-In: Ic4c4e87e62be4fc0c5e394d88cc359518346dffa
2017-11-01Update CleanSpec.mk for the common testcase directories.Simran Basi
Fix an issue with incremental builds and the new common testcase directories. Bug: None Test: Removed https://android-review.googlesource.com/#/c/234478/ then ran `m cts-platform-version-check` then reapplied the change to verify the failure. Then applied this new change to verify the problem was resolved. Change-Id: I77529021e852af35571fb99537d87100010b47af (cherry picked from commit 7fe57cfdcdc086871300d37cf6e80bc94f85b5ee) Merged-In: I77529021e852af35571fb99537d87100010b47af
2017-11-01Output *TS testcases to their own subdir in the common testcase folders.Simran Basi
Instead of dumping all *TS testcases into the common testcase directory directly, place them all in their own subdirectory. Bug: 35153177 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: I22a768dba58d40be1e61885534fb813e7ff08c99 (cherry picked from commit 3fb354cca08ec30cb6aade8da3f4b5ddd119b227) Merged-In: I22a768dba58d40be1e61885534fb813e7ff08c99
2017-11-01Output *TS testcases to common testcase folders.Simran Basi
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 (cherry picked from commit adf63b777a9b7ef1f223f01f3686ed7eb6b48119) Merged-In: I7d5201998ddcb011ecc687c272a0d0a36da248b7
2016-06-26Merge "The easter egg is now its own APK." into nyc-devnougat-devIan Pedowitz
2016-06-26The easter egg is now its own APK.Dan Sandler
It should be included wherever SystemUI is. Bug: 27376882 Change-Id: Ibe2688c86e58bdfb8a5278c9c4939d7cdb524078
2016-06-23resolve merge conflicts of 012144f to nyc-devJeff Vander Stoep
Change-Id: If918f56d5c33db10978b4efc51cf3fe42ed71f1a
2016-06-23Merge \\\"disable unpriv perf by default in user{,debug} builds\\\" into ↵Daniel Micay
mnc-dev am: 11c84f95fb am: a0c61fc832 am: 3cceebf11e Change-Id: Ia91276546041b5e36ddeeb4d855d8efac6101da5
2016-06-23Merge \\"disable unpriv perf by default in user{,debug} builds\\" into ↵Jeffrey Vander Stoep
mnc-dev am: 11c84f95fb am: a0c61fc832 Change-Id: I3eb533e3084fe53f1739a0428ffe5ff583b1ba91
2016-06-23Merge \"disable unpriv perf by default in user{,debug} builds\" into mnc-devDaniel Micay
am: 11c84f95fb Change-Id: Ic82b49068c2d6c834bafb01ea3f698bb9e84d1ac
2016-06-23Merge "disable unpriv perf by default in user{,debug} builds" into mnc-devJeffrey Vander Stoep
2016-06-22Merge "Limit the number of blocks in command zero" into nyc-devTianjie Xu
2016-06-22resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: ↵Zach Jang
cf51c6cb29 am: cbf1e2cc94 am: 9fc3cf7ba2 am: 3749025ccb am: e7bc1542db am: 1be6c69524 Change-Id: If5d6ea4889550f45ef2a8f0ebf53a1e656c39010
2016-06-22resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: ↵Zach Jang
cf51c6cb29 am: cbf1e2cc94 am: 9fc3cf7ba2 am: 3749025ccb am: e7bc1542db Change-Id: I316c25839b0e111bda05ba586733e3712eda5a32
2016-06-22resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: ↵Zach Jang
cf51c6cb29 am: cbf1e2cc94 am: 9fc3cf7ba2 am: 3749025ccb Change-Id: Idadb32ede7b3699e0db8ce632d37e7d2cf99e82b
2016-06-22resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: ↵Zach Jang
cf51c6cb29 am: cbf1e2cc94 am: 9fc3cf7ba2 Change-Id: Idcd5da62fd7c36da94af3a15f35d179e1a3940f2
2016-06-22resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29Zach Jang
am: cbf1e2cc94 Change-Id: I72cff95d6f8878b5d3707f0b0f9c0541c89b9aa5
2016-06-22resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40Zach Jang
am: cf51c6cb29 Change-Id: Id5206a36ff4cee1de3e15f9d5efc64ee731434ee
2016-06-22resolve merge conflicts of 12db224 to lmp-mr1-devZach Jang
am: 0c672afc40 Change-Id: Ibfaa4fa1c68fff09bbee52855a99e296bb603d45
2016-06-21resolve merge conflicts of 12db224 to lmp-mr1-devZach Jang
Change-Id: I8ef3cd2c1d9eb2e4aefe3c678f0a6bb0fdf74c29
2016-06-21resolve merge conflicts of 24cfbfa to lmp-devZach Jang
Change-Id: I5a634582647d154238c5d5bc07ccf1d0fa869132
2016-06-22Updating security string to 2016-08-05 am: 5b14c1f7ceZach Jang
am: 26acdf0c13 Change-Id: I5fa856d2a68d672f314f36c315c3f1857fd386ba
2016-06-22Updating security string to 2016-08-05Zach Jang
am: 5b14c1f7ce Change-Id: I5b2665a6e208d676169b33c08c6761d9de8b8320
2016-06-21Limit the number of blocks in command zeroTianjie Xu
Limit the number of blocks in command zero to 1024 blocks. This prevents the target size of one command from being too large and might help to avoid fsync errors during the OTA update. Bug: 29535618 Change-Id: Ic630cea2599138516162bd0029e2e4b2af75bf4f (cherry picked from commit bb848c54a78572ec2ded3e8ed05ee01f5e8290d9)
2016-06-20Updating security string to 2016-08-05Zach Jang
b/29513589 Change-Id: I5ab4a0aa9d26a95dd0e85d87dcc487867b3f284b
2016-06-16Merge "Added make files for variable PRODUCT_SHIPPING_API_LEVEL. Bug: ↵Vikas Marwaha
26381401" into nyc-dev
2016-06-16Merge "squashfs: make disable-4k-align a parameter" into nyc-devMohamad Ayyash
2016-06-15squashfs: make disable-4k-align a parameterMohamad Ayyash
BUG: 29388879 Change-Id: I121d2b76db5fb269e2f7152abb2e78098437a0d5 Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-06-15Merge "Pass block_list param to mksquashfs" into nyc-devMohamad Ayyash
2016-06-15Merge "releasetools: Disable using imgdiff for squashfs." into nyc-devMohamad Ayyash
2016-06-13Skip uses-library check for preopted apps.Jeff Hao
Bug: 26880306 Change-Id: I97c75cceca30624b5f0c984a5032fdfaf632a90a
2016-06-13releasetools: Disable using imgdiff for squashfs.Tao Bao
We use imgdiff to handle files in zip format (e.g. jar/zip/apk) for higher compression ratio. For system/vendor in squashfs, a) all files are compressed in LZ4 format; b) we use 4096-byte block size in their sparse images, but the files in squashfs may not be laid out as 4K-aligned. So the blocks for a given file as listed in block map may not form a valid zip file, which may fail the patch generation with imgdiff. Disable using imgdiff for squashfs images, and use bsdiff instead. Bug: 22322817 Change-Id: Ie76aa4cece5c9d38cb1d1a34c505a4a8f37512d3
2016-06-13Pass block_list param to mksquashfsMohamad Ayyash
Needed to generate image.map and to optimize the OTA size BUG: 22322817 Change-Id: I7802f4dbb9116a94ea99a00b68c3a7ff180ef08a Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-06-12disable unpriv perf by default in user{,debug} buildsDaniel Micay
(Cherry picked from commit f2ac912b19ccbcc15d5176ec52c99744810adce7) Bug: 29054680 Change-Id: If04bc63fc366006cde842a50b7c764f89d7449a6
2016-06-09Add build.version.incremental to metadataTianjie Xu
Add the build property "build.version.incremental" of the source (if present) and target files to the metadata of the ota update package. Example of metadata: .... post-build-incremental=2951741 post-timestamp=1465345123 pre-build-incremental=2943039 pre-device=bullhead ... Bug: 28658632 Change-Id: I889e8ccf39633b1b35590751001a42d1b05d5514
2016-06-08Merge "Removing N from PLATFORM_VERSION_ALL_CODENAMES" into nyc-devIan Pedowitz
2016-06-07Added make files for variable PRODUCT_SHIPPING_API_LEVEL.Vikas Marwaha
Bug: 26381401 Change-Id: I8f2e630118cfa474564eb21911448bc813fcfec7
2016-06-07Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-devGustav Sennton
2016-06-06NYC is 7.0Ian Pedowitz
Bug: 29056633 Change-Id: Ib0186c5affd16b5223ba547b2cfff49d830dac1c
2016-06-06Removing N from PLATFORM_VERSION_ALL_CODENAMESIan Pedowitz
Change-Id: I328dfa703faf2bd3232f68102d5c7f4b379df030 Fixes: 29117805
2016-06-06Merge "Add default values for pm.dexopt.core-app." into nyc-devNarayan Kamath
2016-06-03NYC is now RELIan Pedowitz
PLATFORM_VERSION_ALL_CODENAMES needs to include N for now Bug: 28810934 Bug: 29117805 Change-Id: Ibf44e1e02077e7830d9bf92b87fb8ccae029c121
2016-06-03Add variable PRODUCT_SHIPPING_API_LEVEL.Gustav Sennton
PRODUCT_SHIPPING_API_LEVEL declares which API level a device first shipped with. We use this variable to set a read-only property that can be used in CTS/GTS tests. Bug: 26381401 Change-Id: I9dfeaf423146c35f57e69ac26c27e8a9e205bc4f
2016-06-02Add default values for pm.dexopt.core-app.Narayan Kamath
bug: 28998083 Change-Id: Iec4415ad7e5122c1168024f6ccf39b5e342cc7fd
2016-06-01disable unpriv perf by default in user{,debug} buildsDaniel Micay
(Cherry picked from commit fe01f56c0d5c42508e1e82f5976e4c10bb00f632) Bug: 29054680 Change-Id: If04bc63fc366006cde842a50b7c764f89d7449a6
2016-05-28Merge "Add build number to apps' version name for non-platform build" into ↵Lance Jin-woong Chang
nyc-dev
2016-05-27Add system/extras/verity/build_verity_metadata.py to otatools am: ↵Baligh Uddin
e718501021 am: 5d77e7e0c1 am: 9f527d5222 * commit '9f527d52229c973fddd94b926b803a6be68ae440': Add system/extras/verity/build_verity_metadata.py to otatools Change-Id: Ie7d8b7401ee58ace28a089f97eeb4bc00c43c100
2016-05-27Add system/extras/verity/build_verity_metadata.py to otatools am: e718501021Baligh Uddin
am: 5d77e7e0c1 * commit '5d77e7e0c1425c8d1ed60dd5425267ce79ef4648': Add system/extras/verity/build_verity_metadata.py to otatools Change-Id: I6a242bbdf47b588064c94b90f47ffdd5dabef1cc
2016-05-27Add system/extras/verity/build_verity_metadata.py to otatoolsBaligh Uddin
am: e718501021 * commit 'e718501021dd039875745d3ff829341c2bb05248': Add system/extras/verity/build_verity_metadata.py to otatools Change-Id: I25d3edc76e97f1249768bd9e9bbbecdf8fc5fe79