Commit Graph

23938 Commits

Author SHA1 Message Date
Adrian Roos 3986d504d6 am 6784cae4: Switch build to stricter aapt symbol generation
* commit '6784cae413a757fc5516cfc344eaf435c6113170':
  Switch build to stricter aapt symbol generation
2015-06-10 23:17:31 +00:00
Tao Bao abfe104408 Merge "Support SELinux context label when mounting" into mnc-dev 2015-06-10 23:08:46 +00:00
Tao Bao 548eb76c8f Support SELinux context label when mounting
If there is a SELinux context label in the recovery.fstab, we should
honor that when mounting the partition.

Bug: 19764039
Change-Id: I4df71a092b418cd340a18b2e3b0936de33d8e3f5
2015-06-10 15:35:34 -07:00
Stuart Scott 3a0374548a Remove repository directory.
We no longer have plans as xml files, so this extra directory level is
unnecessary.

Change-Id: Id513685d60c4abee2932a31bb89a2a518a285270
2015-06-10 15:28:08 -07:00
Adrian Roos 6784cae413 Switch build to stricter aapt symbol generation
Prevents aapt from generating java symbols for strings that don't have
a default localization.

Bug: 21537397
Change-Id: I2f17397e33d823045f7dcff02e3d0817f3f81849
2015-06-10 20:00:13 +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
Baligh Uddin 1260e08d02 am d80f0868: am 942a42e3: Merge "Allow custom boot_signer and verity_signer." into mnc-dev
* commit 'd80f08688c6d46ad24d2465acd11a840e45fdc5d':
  Allow custom boot_signer and verity_signer.
2015-06-09 23:40:58 +00:00
Baligh Uddin d80f08688c am 942a42e3: Merge "Allow custom boot_signer and verity_signer." into mnc-dev
* commit '942a42e31de9a0468014a256ed7fdd67cb208e64':
  Allow custom boot_signer and verity_signer.
2015-06-09 23:28:07 +00:00
Baligh Uddin 942a42e31d Merge "Allow custom boot_signer and verity_signer." into mnc-dev 2015-06-09 23:00:59 +00:00
Baligh Uddin 601ddeae06 Allow custom boot_signer and verity_signer.
Bug: 21701163
Change-Id: I85e75fd3a166a9f6a7859ebf81dee73322dc2798
2015-06-09 15:48:14 -07:00
Claes Elgemark 9b01b8e296 am f49cd4b4: am b5cd1f03: Add missing shared libraries to dist tools
* commit 'f49cd4b44992f0274e97150755cc70acd2dc2f27':
  Add missing shared libraries to dist tools
2015-06-09 17:12:32 +00:00
Ying Wang 15e742940d am 616f5707: am 740dee5a: am 1b96592a: Merge "Add build_verity_metadata.py to dist-tools"
* commit '616f5707a336a83ea490c43bbee935c4c39f3b69':
  Add build_verity_metadata.py to dist-tools
2015-06-09 17:02:58 +00:00
Claes Elgemark f49cd4b449 am b5cd1f03: Add missing shared libraries to dist tools
* commit 'b5cd1f03c2e722112526b4abdd9b3299364c7788':
  Add missing shared libraries to dist tools
2015-06-09 17:02:47 +00:00
Ying Wang 616f5707a3 am 740dee5a: am 1b96592a: Merge "Add build_verity_metadata.py to dist-tools"
* commit '740dee5a5626724051883b6f9c9a7df511b65b29':
  Add build_verity_metadata.py to dist-tools
2015-06-09 16:41:29 +00:00
Ying Wang 740dee5a56 am 1b96592a: Merge "Add build_verity_metadata.py to dist-tools"
* commit '1b96592aab7a8e3d357a4e09f685968edcfe05b9':
  Add build_verity_metadata.py to dist-tools
2015-06-09 16:32:52 +00:00
Ying Wang 1b96592aab Merge "Add build_verity_metadata.py to dist-tools" 2015-06-09 16:20:49 +00:00
Claes Elgemark b5cd1f03c2 Add missing shared libraries to dist tools
(cherry pick from d0ec665727)

Add missing libraries used by e2fsck and build_verity_tree.

Change-Id: I8bf0341300863ef0090b395b2aba0b7a952f6b58
2015-06-09 09:16:27 -07:00
Narayan Kamath 2b15c81dc8 am ff321c91: am 4cdb0d34: am 7d2c71cf: Merge "Remove duplicate CTS tests from libcore cts packages."
* commit 'ff321c91613e68f9c3a6a588b4ae93d1f7a82111':
  Remove duplicate CTS tests from libcore cts packages.
2015-06-09 10:35:28 +00:00
Narayan Kamath ff321c9161 am 4cdb0d34: am 7d2c71cf: Merge "Remove duplicate CTS tests from libcore cts packages."
* commit '4cdb0d34395bef9828e38fca6281603dd784de84':
  Remove duplicate CTS tests from libcore cts packages.
2015-06-09 10:23:07 +00:00
Narayan Kamath 4cdb0d3439 am 7d2c71cf: Merge "Remove duplicate CTS tests from libcore cts packages."
* commit '7d2c71cf90cc8da55c8b8faad5910267c23ae542':
  Remove duplicate CTS tests from libcore cts packages.
2015-06-09 10:12:12 +00:00
Narayan Kamath 7d2c71cf90 Merge "Remove duplicate CTS tests from libcore cts packages." 2015-06-09 10:03:16 +00:00
Narayan Kamath 6ca9b2b1a3 Remove duplicate CTS tests from libcore cts packages.
The catch all "org" package was catching several thousand
org.apache.harmony.tests.* tests that are already covered by
other packages. Replace the catch-all org.* with specific prefixes.

Needs additional support in CollectAllTests to handle multiple
prefixes. This is implemented in the companion change.

bug: 20862863

(cherry picked from commit cf7fbcd03d)

Change-Id: I1d28f91cfca098ccdcd62e88bb486b433d9c29d8
2015-06-09 10:52:34 +01:00
Mark Salyzyn 2cc2a2a0ef am 6d697519: am 5ced4018: am 911637bf: Merge "Add missing shared libraries to dist tools"
* commit '6d69751916fd2d41196caf780daf65a701cb715a':
  Add missing shared libraries to dist tools
2015-06-09 00:28:14 +00:00
Mark Salyzyn 6d69751916 am 5ced4018: am 911637bf: Merge "Add missing shared libraries to dist tools"
* commit '5ced401874da219d66077f7a85c939594624ae0c':
  Add missing shared libraries to dist tools
2015-06-09 00:15:53 +00:00
Ying Wang bd7848688b am bae01ccd: am 18e98163: am 8e42131b: Merge "Strip path from verity_signer_cmd in the target-files meta data."
* commit 'bae01ccd975b8a5e2adc4783b1bf330140362bde':
  Strip path from verity_signer_cmd in the target-files meta data.
2015-06-09 00:15:15 +00:00
Ying Wang bae01ccd97 am 18e98163: am 8e42131b: Merge "Strip path from verity_signer_cmd in the target-files meta data."
* commit '18e981638d77af502a42895fbb37bc80e3642283':
  Strip path from verity_signer_cmd in the target-files meta data.
2015-06-09 00:01:03 +00:00
Mark Salyzyn 5ced401874 am 911637bf: Merge "Add missing shared libraries to dist tools"
* commit '911637bf33b2f8994fc93eb8ea6e4a8428122e13':
  Add missing shared libraries to dist tools
2015-06-09 00:00:37 +00:00
Mark Salyzyn 911637bf33 Merge "Add missing shared libraries to dist tools" 2015-06-08 23:51:33 +00:00
Ying Wang 18e981638d am 8e42131b: Merge "Strip path from verity_signer_cmd in the target-files meta data."
* commit '8e42131ba2aa4fd12395e2c122ab62c9991e6f72':
  Strip path from verity_signer_cmd in the target-files meta data.
2015-06-08 23:48:24 +00:00
Ying Wang 8e42131ba2 Merge "Strip path from verity_signer_cmd in the target-files meta data." 2015-06-08 23:40:01 +00:00
Stuart Scott cf75b2bd9e Merge "Only copy tools, not test artifacts" 2015-06-08 23:24:09 +00:00
Stuart Scott 1dcff84ce6 Only copy tools, not test artifacts
Change-Id: I723f580a6cea783dc07d12883dfe36120e462784
2015-06-08 16:19:27 -07:00
Omari Stephens d42598ce58 Merge "Add the ability to display annotations in the generated docs" 2015-06-08 23:11:39 +00:00
Ying Wang 8c7dd85758 am bc0f1f56: am ac3f88d8: am 080f57ae: Merge "Remove the unnecessary full_x86_64 and full_mips64."
* commit 'bc0f1f565143a676dfdb5e2234c94e7da3116a0f':
  Remove the unnecessary full_x86_64 and full_mips64.
2015-06-08 20:21:12 +00:00
Ying Wang bc0f1f5651 am ac3f88d8: am 080f57ae: Merge "Remove the unnecessary full_x86_64 and full_mips64."
* commit 'ac3f88d8a2812cd2134f9b67ec4a928d886a4eb6':
  Remove the unnecessary full_x86_64 and full_mips64.
2015-06-08 20:08:09 +00:00
Ying Wang ac3f88d8a2 am 080f57ae: Merge "Remove the unnecessary full_x86_64 and full_mips64."
* commit '080f57aed7ac0f03c5db216dafe5023b032525ed':
  Remove the unnecessary full_x86_64 and full_mips64.
2015-06-08 19:15:13 +00:00
Ying Wang 080f57aed7 Merge "Remove the unnecessary full_x86_64 and full_mips64." 2015-06-08 19:01:47 +00:00
Ying Wang 0a76df5ce7 Remove the unnecessary full_x86_64 and full_mips64.
For historical reason, the aosp_* products were named full_*.
We keep the full, full_x86 and full_mips in case some tools still
reference these legacy names; But no reason the have the full_* product
names for the new 64-bit archs.

Change-Id: I240ed0c6ded0ded2d80603bd0c5ff24750999afc
2015-06-08 11:57:26 -07:00
Omari Stephens 87c44d8a11 Add the ability to display annotations in the generated docs
Bug: 8440225
Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
2015-06-05 18:12:26 -07:00
Stuart Scott 6fdc763dbb Merge "Adds the compatibility build task and cts_v2 rules." 2015-06-05 14:59:28 +00:00
Claes Elgemark 82a19d3662 Add build_verity_metadata.py to dist-tools
Preserve path as it is referenced by build_image.py.

Change-Id: Id6833d243b5a15b4ee5e0013340aeb2cd35f3578
2015-06-05 10:31:53 +02:00
Luan Nguyen 6c679d1a65 am c4c51746: am 18985e76: am 30b16ac6: am 95a1818f: Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs
* commit 'c4c51746cb5f1965b5174bf56f2b4f8c8f59b646':
  docs: Add styles for embedded videos to match DevSite
2015-06-05 03:01:10 +00:00
Luan Nguyen c4c51746cb am 18985e76: am 30b16ac6: am 95a1818f: Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs
* commit '18985e76617fefab2d9bf480c99994e1e9ba9143':
  docs: Add styles for embedded videos to match DevSite
2015-06-05 02:50:18 +00:00
Luan Nguyen 18985e7661 am 30b16ac6: am 95a1818f: Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs
* commit '30b16ac6a4d4658d927d48476081de7542b5989f':
  docs: Add styles for embedded videos to match DevSite
2015-06-05 02:27:29 +00:00
Stuart Scott 1926e9b8bf Adds the compatibility build task and cts_v2 rules.
Change-Id: If7939dba38566f26cbc678da3fe7cb605c19745a
2015-06-04 15:09:47 -07:00
Dimitry Ivanov a66f8bae07 am 9c836723: am 72bced8a: Merge changes from topic \'prebuilt-open-from-apk\' into mnc-dev
* commit '9c836723b784a344442d4646fc849470b8fcd515':
  Uncompress .so files before signing the apk.
  Don't extract jni from prebuilt apks.
2015-06-04 20:33:25 +00:00
Dimitry Ivanov 9c836723b7 am 72bced8a: Merge changes from topic \'prebuilt-open-from-apk\' into mnc-dev
* commit '72bced8a758a3a8427768d97e6d763f6a706d2b1':
  Uncompress .so files before signing the apk.
  Don't extract jni from prebuilt apks.
2015-06-04 20:19:49 +00:00
Dimitry Ivanov 72bced8a75 Merge changes from topic 'prebuilt-open-from-apk' into mnc-dev
* changes:
  Uncompress .so files before signing the apk.
  Don't extract jni from prebuilt apks.
2015-06-04 18:33:00 +00:00
Ying Wang 562d700ab9 Make AndroidTest.xml optional.
Make AndroidTest.xml optional for compatibility suite module.

Change-Id: I6622e17191fa67b33c577056681b989516f3a3a8
2015-06-04 11:22:23 -07:00