Commit Graph

610 Commits

Author SHA1 Message Date
Ying Wang 70555a1677 am fcd22c88: Merge "Allow to build target-files.zip in sdk build." into klp-modular-dev
* commit 'fcd22c8848b829eec7e661fb270fea1a18bcba28':
  Allow to build target-files.zip in sdk build.
2014-04-15 16:12:26 +00:00
Ying Wang 4709d7c3a5 Allow to build target-files.zip in sdk build.
and put the target-files.zip on the build server.

Bug: 13763122
Change-Id: I71ab6aa40666fdb24ec0da0fbfc7b73753d4f0c7
2014-04-14 17:25:43 -07:00
Jeff Sharkey 26e1a28e7f Pass OEM property list to OTA tools, thumbprint.
The OTA generation scripts need to know what system properties to
read from the OEM partition, so pass along from product definition.

Also define "thumbprint" which is only the build-specific parts of
the fingerprint.  (Thumbs are smaller than fingers.)

Bug: 13367676
Change-Id: Iae051dcd2b1c67a7c8554d8ae318a4c54a86d614
2014-04-09 15:00:36 -07:00
Jeff Sharkey 491055df99 Merge "Import OEM build properties, if defined." 2014-04-09 15:44:06 +00:00
Narayan Kamath 110ea46e09 resolved conflicts for merge of 8af7e8ed to master
Change-Id: Ib427b36e133e29d1c2e9cea065e4e63c1e2e2122
2014-04-09 12:33:03 +01:00
Narayan Kamath 8af7e8ed3e resolved conflicts for merge of 1852237a to klp-modular-dev-plus-aosp
Change-Id: I09a8a4e95fc956392a0c61f38bd12332149a8d96
2014-04-09 10:03:41 +01:00
Narayan Kamath 7303ebda84 Add 32 / 64 bit abi lists to system properties.
Introduce ro.product.cpu.abilist32 / abilist64, which are
comma separated lists of the 32 and 64 bit ABIs that the
device supports. These properties are used by the zygote and
system server to determine what ABI an app should be
started with.

This changes move abilist related make steps out of envsetup.mk
and into config.mk because they depend on variables set by
core/combo/***. Additionally, config.mk performs a few additional
cleanups of these variables (like stripping them) after the
inclusion of envsetup.mk so this seems like a better place to
put them.

bug: 13647418

Change-Id: I3db39bdd761220c5b4966f651892fb592396f9a1
2014-04-08 17:40:40 +01:00
Doug Zongker 25d55f8733 select recovery assets based on target density
Recovery now has different res-*dpi directories for different display
densities.  Select one based on the highest density specified in
PRODUCT_AAPT_CONFIG.

Change-Id: Ieb0657a08e5df87f914fdda78a038cbbf82619e9
2014-04-04 14:41:05 -07:00
Narayan Kamath b4d757b1b2 am f6811abe: am 9fbd3afd: am 431b4bb3: Merge "Extend the CPU ABI specification mechanism."
* commit 'f6811abe12601c9753f329cb34da568f0072ca76':
  Extend the CPU ABI specification mechanism.
2014-03-31 12:35:14 +00:00
Narayan Kamath f6811abe12 am 9fbd3afd: am 431b4bb3: Merge "Extend the CPU ABI specification mechanism."
* commit '9fbd3afdecc2fee211c11a6aedb39422fa8dd773':
  Extend the CPU ABI specification mechanism.
2014-03-31 12:21:55 +00:00
Narayan Kamath 1a43b375b4 Extend the CPU ABI specification mechanism.
Add a (read only) system property that is a comma
separated list of ABIs supported by the device in order
of preference. For example, typical arm-v8 device might
define:

ro.cpu.abilist = arm64-v8a,armeabi-v7a,armeabi

For most purposes, a single flattened list like the above is
probably more useful than the parallel system of variables
TARGET_CPU_ABI{2} / TARGET_2ND_ARCH_CPU_ABI{2} that we use
in the build system.

Change-Id: If9102669ad9f5f8fd89a8bcc5bf88cca1acadc3c
2014-03-28 17:10:47 +00:00
Jeff Sharkey 26d22f7139 Import OEM build properties, if defined.
Certain products can define a list of system properties that should be
delegated to the OEM.  Since these properties may be ro.*, we give
them first shot at defining.

Also support blacklist of properties that should never be defined by
build.prop, used to delegate to runtime fingerprint generation.

Bug: 13367676
Change-Id: I3f00db732f485818205a7b76b31edbdc3a89aac0
2014-03-21 13:22:54 -07:00
Ying Wang ae5a1e1447 Try to catch more misuse of $(my-dir).
(cherry picked from commit 79e8319b2e)

Change-Id: I779af79c83de2ad1944269dd5bd31d65ff844064
2014-03-18 15:11:44 -07:00
Colin Cross 9bdcdff615 HACK: add 64-bit directory blacklist
Change-Id: I431e8b220db81d51930dc0b3d95995df120c179a
2014-03-13 11:26:26 -07:00
Ying Wang 009f48b00f am a6230641: am 26bcd640: Merge "Try to catch more misuse of ."
* commit 'a623064131f23412daa0ac4b333320e2e30d85f0':
  Try to catch more misuse of $(my-dir).
2014-03-11 18:17:42 +00:00
Ying Wang 9638890678 am 66a9b789: Merge "Include privileged apps with app zip file."
* commit '66a9b789703b7fac5f57fa318209dc8211f800f7':
  Include privileged apps with app zip file.
2014-03-11 18:16:01 +00:00
Doug Zongker 32b527d6cb test block system image patch at build time
After building a patch for the system image (for incremental block
OTAs), apply it to a local copy of the file and test that it succeeds.
This is an imperfect test as it's using the local client's
syspatch_host, which may differ from the syspatch library actually
used in the target build, but it's somewhat better than nothing.

Change-Id: Ic0001b0145881e2ebd4b5b36ce9b5bcebd76deb4
2014-03-04 10:03:02 -08:00
Doug Zongker 5fad2039bb handle don't care regions in the system image
The system partitions has regions that we shouldn't write and can't
depend on the contents of.  Adds a new script to generate a map of
these regions (using the sparse image as input), and include the map
in the package zip so it can be used when writing or patching the
system partition.

Also fixes a bug where the wrong SELinux file contexts are used when
generating incrementals.

Change-Id: Iaca5b967a3b7d1df843c7c21becc19b3f1633dad
2014-03-03 10:57:23 -08:00
Ying Wang 3bbfddd2ea Revert "Fix build: Revert "Try to catch more misuse of $(my-dir).""
This reverts commit 4f6e8342ac.
2014-03-01 15:32:04 -08:00
Ed Heyl 4f6e8342ac Fix build: Revert "Try to catch more misuse of $(my-dir)."
This reverts commit 79e8319b2e.

Change-Id: I7d4d352da802deea870fbe4f61f7a7023460a405
2014-03-01 14:25:08 -08:00
Ying Wang f6f141a873 am 9cf7af63: am 0c0e9b81: am a6230641: am 26bcd640: Merge "Try to catch more misuse of ."
* commit '9cf7af6317e6f792f0c044f786983481210022cc':
  Try to catch more misuse of $(my-dir).
2014-03-01 17:40:59 +00:00
Ying Wang 0c0e9b8153 am a6230641: am 26bcd640: Merge "Try to catch more misuse of ."
* commit 'a623064131f23412daa0ac4b333320e2e30d85f0':
  Try to catch more misuse of $(my-dir).
2014-03-01 17:34:29 +00:00
Ying Wang 79e8319b2e Try to catch more misuse of $(my-dir).
Change-Id: I0c07d7115c66b30ba1383dfaa133f0cc40a33ad7
2014-02-28 18:23:06 -08:00
Griff Hazen b1f4364868 am d3b40d52: am 6c23e7b8: am 433febb3: Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
* commit 'd3b40d5235d76461bf60f1eac73c132a06b1a30d':
  Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
2014-02-28 18:10:02 +00:00
Griff Hazen 6c23e7b8b4 am 433febb3: Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
* commit '433febb3c4593e777ef393371b6e99dcce9a7217':
  Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
2014-02-28 18:05:36 +00:00
Griff Hazen 433febb3c4 Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
Change-Id: Iecea3f3af628d89df65a44293a977b2bce35bf28
2014-02-28 08:45:59 -08:00
Ying Wang 70543d378e am f7d12336: am b3f2893f: am 66a9b789: Merge "Include privileged apps with app zip file."
* commit 'f7d12336f5aacf715636519363651ab9050abf8f':
  Include privileged apps with app zip file.
2014-02-27 01:36:03 +00:00
Ying Wang b3f2893f79 am 66a9b789: Merge "Include privileged apps with app zip file."
* commit '66a9b789703b7fac5f57fa318209dc8211f800f7':
  Include privileged apps with app zip file.
2014-02-27 01:30:08 +00:00
Robert Craig 59ec195a4d Include privileged apps with app zip file.
Include apps that appear under /system/priv-app
to also be included with the zip of all the apps.

Change-Id: If4687cf4c471877f11d78b68bad96f1842e49d87
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-02-26 12:00:14 -05:00
Doug Zongker 26e6619c37 add --block flag to ota_from_target_files
Add the --block flag to this script to control whether block-based OTA
packages are generated (defaults to off).  Make the full OTA package
produced by "make otapackage" continue to produce a block-based OTA.

Also fix a problem where block incremental OTAs didn't ever succeed,
and the --no_signing option never worked.

Change-Id: I610d0b4abed4b8b65fbe8ce0abaeec6cf52e14a1
2014-02-20 13:30:44 -08:00
Doug Zongker e322058542 img_from_target_files doesn't need releasetools extensions
This argument is superfluous; we don't need to compute its value or
pass it to the script.

Change-Id: I567a5c0b67060f8fcc0bf83e5bfa0272312b9124
2014-02-20 08:47:29 -08:00
Ying Wang 8918bf6f2f am f1339406: am 0c0a4ce8: Remove the default sdk.atree if custom one is set.
* commit 'f133940642722c45a37aad718423f3dac58233c0':
  Remove the default sdk.atree if custom one is set.
2014-02-18 23:00:02 +00:00
Ying Wang f133940642 am 0c0a4ce8: Remove the default sdk.atree if custom one is set.
* commit '0c0a4ce8f4c40b47d34774c7f36c80ae7f8082fc':
  Remove the default sdk.atree if custom one is set.
2014-02-18 22:54:08 +00:00
Ying Wang 0c0a4ce8f4 Remove the default sdk.atree if custom one is set.
Change-Id: I5d20b030db5ef29d7ff6eb64a0a1e11a4283e85d
2014-02-18 14:33:25 -08:00
Colin Cross 84a20ac12e am 2c32144b: resolved conflicts for merge of 7cd7bd65 to klp-modular-dev-plus-aosp
* commit '2c32144b328e0191fa32bf342dc7eb01d6174b6e':
  HACK: add 64-bit directory blacklist
  add support for module supported or unsupported target architectures
2014-02-12 23:00:21 +00:00
Ying Wang 53d2ca0713 am 4170e2be: am fd841351: Merge "Support custom sdk.atree files." into klp-modular-dev
* commit '4170e2be8e7493f2ad1abd33ba74638d9d421b3b':
  Support custom sdk.atree files.
2014-02-12 23:00:18 +00:00
Colin Cross 2c32144b32 resolved conflicts for merge of 7cd7bd65 to klp-modular-dev-plus-aosp
Change-Id: Ib4f062a59d442b29b9782fd8c0328fd551c3a32a
2014-02-12 13:09:29 -08:00
Colin Cross 02e31d240a HACK: add 64-bit directory blacklist
Change-Id: I431e8b220db81d51930dc0b3d95995df120c179a
2014-02-12 12:17:55 -08:00
Doug Zongker c9253822ea add recovery update code to system images
Currently, the "img" zip files generated by the build system lack the
script and data needed to rewrite the recovery partition, while the
"ota" zip files do (when installed).

In order to move towards block-based OTAs, we want the result of
flashing an image and the result of installing the corresponding OTA
package to be identical.

Generate the recovery-from-boot patch and install script as part of
the process of building the target-files.  This requires breaking the
code to generate that out of ota_from_target_files into its own tool
that we can run from the Makefile.  (ota_from_target_files can still
do this, so it continues to work with older target-files.)

Bug: 12893978
Change-Id: I80e62268840780b81216e548be89b47baf81b4ac
2014-02-04 13:50:35 -08:00
Ying Wang 780128a6f0 Support custom sdk.atree files.
Bug: 12683047
Change-Id: I79ca1eff81e947d03c50759d47426487e48435d0
2014-01-29 13:35:55 -08:00
Ying Wang c6c21d0622 Revert "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES.""
This reverts commit 06b3255118.
2014-01-21 20:25:46 -08:00
Ying Wang 036d2c1857 am 4a814d0a: am a0d68280: am f5db4548: am 62043de3: Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES.""
* commit '4a814d0a69470c96414a5e49b1ff90eb8935e2f9':
  Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
2014-01-22 04:06:56 +00:00
Ying Wang a0d68280ca am f5db4548: am 62043de3: Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES.""
* commit 'f5db454865c7b8cff22cc8faaeb5b983f059cb73':
  Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
2014-01-22 04:00:19 +00:00
Ying Wang f5db454865 am 62043de3: Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES.""
* commit '62043de346dff2d31c58bc8c002699fc74d1351c':
  Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
2014-01-21 19:57:41 -08:00
Ying Wang 06b3255118 Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
This reverts commit ca37190711.

Change-Id: I3a76f4cdf92ecbe3059bf5856cf341874e1393cf
2014-01-22 03:48:27 +00:00
Ying Wang e9924d7715 am 6e8e82ea: am 10515519: am 70cc8553: am 8d1f91fa: Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
* commit '6e8e82ea585f964981896cc510f007574ce6da2c':
  Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
2014-01-21 20:44:23 +00:00
Ying Wang 10515519ee am 70cc8553: am 8d1f91fa: Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
* commit '70cc85533dacfaa499f39c417cfd78e3ed922414':
  Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
2014-01-21 20:37:50 +00:00
Ying Wang 70cc85533d am 8d1f91fa: Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
* commit '8d1f91fa548c80357fffbdbdd5dcccc3c461c9ec':
  Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
2014-01-21 12:36:33 -08:00
Robert Craig ca37190711 Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
PRODUCT_COPY_FILES entries can include the src:dest:owner
syntax versus src:dest. This causes the filter to miss
certain cases. Instead use the word-colon function to
grab the dest regardless of syntax.

Change-Id: I1f4e57a236c1db148bada0cfe5bd1e87bb1194d6
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-01-17 09:13:50 -05:00
Ying Wang 734afe4e42 am 94ff79ea: am adc66128: am b6c57051: am f5ce4fa9: Merge "Install 64-bit libraries to /system/lib64."
* commit '94ff79eaf2d66be4c83656a41b4efa38ad34a970':
  Install 64-bit libraries to /system/lib64.
2014-01-14 20:15:45 +00:00
Ying Wang adc66128dc am b6c57051: am f5ce4fa9: Merge "Install 64-bit libraries to /system/lib64."
* commit 'b6c570510aa1d2747538fe734292873ed13f5b67':
  Install 64-bit libraries to /system/lib64.
2014-01-14 20:10:16 +00:00
Ying Wang b6c570510a am f5ce4fa9: Merge "Install 64-bit libraries to /system/lib64."
* commit 'f5ce4fa983f08d42bbc5d96af4f86bce5c190f0c':
  Install 64-bit libraries to /system/lib64.
2014-01-14 12:08:32 -08:00
Ying Wang c634974d37 Install 64-bit libraries to /system/lib64.
/system/lib always contains 32-bit libraries, and /system/lib64 (if
present) always contains 64-bit libraries.
Move things around a little bit, so TARGET_ARCH can be used to define
the build paths.

Bug: 11654773
Change-Id: I2edd91e162c7a20d7719d7bae15e5fa6c2a5b498
2014-01-13 16:20:31 -08:00
Ying Wang 1ff0836ce0 Emma support for host Java libraries.
To run emma on a host Java library, in the module definition use:
LOCAL_EMMA_INSTRUMENT := true
then run make with "EMMA_INSTRUMENT=true".

Bug: 12178695
Change-Id: Ie31582b94f5c45381f534912e810f88d21dde9b2
2013-12-30 09:17:06 -08:00
Michael Runge d537f93f20 am 4edeba20: am a8e32578: am 41e19a4c: am 6b55f007: am facd992e: Makefile used spaces instead of a tab
* commit '4edeba203d39698d1d7c8ddb1ef7906de630a24f':
  Makefile used spaces instead of a tab
2013-12-26 23:50:26 +00:00
Michael Runge 52ad1d7043 am 1a4520a5: am d961b7d0: am 5636d07a: am a80542db: am 4038aa8f: Enabled incrementals to patch + rename moved files
* commit '1a4520a5680a05a360986b260d15e170ed899da5':
  Enabled incrementals to patch + rename moved files
2013-12-26 23:50:25 +00:00
Michael Runge a8e325788c am 41e19a4c: am 6b55f007: am facd992e: Makefile used spaces instead of a tab
* commit '41e19a4cf0f10740aa3437b1c2365e49d4f15181':
  Makefile used spaces instead of a tab
2013-12-26 23:37:45 +00:00
Michael Runge d961b7d083 am 5636d07a: am a80542db: am 4038aa8f: Enabled incrementals to patch + rename moved files
* commit '5636d07a29108c77e6b8d38d96b0a1af3bae53ec':
  Enabled incrementals to patch + rename moved files
2013-12-26 23:37:44 +00:00
Michael Runge 41e19a4cf0 am 6b55f007: am facd992e: Makefile used spaces instead of a tab
* commit '6b55f00762c03b3625862b89f704090f58f970e7':
  Makefile used spaces instead of a tab
2013-12-26 15:33:32 -08:00
Michael Runge 5636d07a29 am a80542db: am 4038aa8f: Enabled incrementals to patch + rename moved files
* commit 'a80542dbf4f193c59525b8749871bcdf4ae4283a':
  Enabled incrementals to patch + rename moved files
2013-12-26 15:33:27 -08:00
Michael Runge facd992ec7 Makefile used spaces instead of a tab
Change-Id: Ia34f80d99062ef2899527f11d7bf72e78c63e31c
2013-12-20 11:50:16 -08:00
Colin Cross 7a9dd8314b am 2cc48c71: am 20f04df8: Merge "build: always include host java files in platform.zip" into klp-volantis-dev
* commit '2cc48c7138a36d53ce8dfe585099a119d19cbe10':
  build: always include host java files in platform.zip
2013-12-19 06:39:19 +00:00
Colin Cross c451a373a4 build: always include host java files in platform.zip
Building recovery requires building a host .jar file.  Change
platform.zip to always include the necessary host java prebuilts,
instead of only when building the 'platform-java' target.

Bug: 12186985
Change-Id: Ic823d764cb6b39bbf8c5d90c94b5dc99b55d34dc
2013-12-18 20:01:38 -08:00
Colin Cross f1c7471a61 am ceb2f452: am 59d411c8: Merge changes I57b49033,I03ddf981 into klp-volantis-dev
* commit 'ceb2f452a6a9b94ad9407f69c1bd3a9fc8afd6d0':
  Revert "Disable recovery in PDK builds"
  pdk: add bouncycastle-host javalib.jar to platform.zip
2013-12-17 21:46:37 +00:00
Colin Cross 57b490334a Revert "Disable recovery in PDK builds"
This reverts commit 2e9d15d0b6.

Bug: 12186985
2013-12-17 12:09:02 -08:00
Michael Runge 4038aa8fff Enabled incrementals to patch + rename moved files
Change-Id: I551fc5291847e3ace15361c203d86f566c26da97
2013-12-16 11:29:51 -08:00
Colin Cross 9781049c41 Merge "Disable recovery in PDK builds" into klp-volantis-dev 2013-12-03 17:44:08 +00:00
Doug Zongker b00398a07e am a6fadb61: am 57c9ffef: am 9b23f2cd: add option to generate two-step recovery files
* commit 'a6fadb61cae38089bc534f3cb995b98689f796cb':
  add option to generate two-step recovery files
2013-12-03 17:06:04 +00:00
Doug Zongker a6fadb61ca am 57c9ffef: am 9b23f2cd: add option to generate two-step recovery files
* commit '57c9ffef30a6f34e126d8e89a08d208b05cc4901':
  add option to generate two-step recovery files
2013-12-03 08:58:11 -08:00
Mike Lockwood 2e9d15d0b6 Disable recovery in PDK builds
Change-Id: Ic6ee44cef37104c8d7facc28dfe45d0ef832ebd0
2013-12-02 23:20:53 -08:00
Doug Zongker 9b23f2cd78 add option to generate two-step recovery files
When run with the -2 option, ota_from_target_files will generate a
package (full or incremental) that does some extra reboots in order to
install the new recovery first, so that the rest of the installation
is done with the new recovery.  This can be useful if (say) the
package installation needs some features from the newer kernel.

For incremental packages, the verification phase is still done with
the old recovery.

This is only supported on devices where the misc partition is EMMC
(not MTD).

Two-step packages are slower to install and possibly confusing to
users (they will see their device reboot four times instead of twice),
so only use this option if necessary.

Change-Id: I3267d905e5e8eb1a1eb61bf48255b8b24ffc4ad1
2013-11-27 11:27:55 -08:00
Ying Wang 33d6459181 Also package the unobfuscated classes.jar into proguard-dic.zip
proguard-dic.zip is generated and stored on the build server for
apps-only build.

Bug: 11811736
Change-Id: I2629dd1e28515d3b02f455f19b030ae291136559
2013-11-25 17:39:50 -08:00
Doug Zongker ce61f1fe2e am b1e393dd: am b480d152: am 816d73f9: store releasetools.py in the target_files zip
* commit 'b1e393ddad02684198e4da414417b66bd09862b8':
  store releasetools.py in the target_files zip
2013-11-22 13:45:40 -08:00
Doug Zongker b1e393ddad am b480d152: am 816d73f9: store releasetools.py in the target_files zip
* commit 'b480d1529e10b608c590a87839cfbafc46b2caed':
  store releasetools.py in the target_files zip
2013-11-22 13:43:05 -08:00
Doug Zongker 816d73f9eb store releasetools.py in the target_files zip
Save the device-specific releasetools.py module in the target_files
zip so that the OTA tools can use it without needing to get it from a
client.

Change-Id: I2dd5f4628290a8f2f56bd519b07d4ca8d92fddcd
2013-11-22 13:29:55 -08:00
Dave Langemak cb067ad2f6 am c3644114: am 8ea83e90: am 96f56b6f: Merge "Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."" into klp-dev
* commit 'c3644114805150eef2f5035085878e5f860c7436':
  Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."
2013-11-21 22:59:47 -08:00
Dave Langemak c364411480 am 8ea83e90: am 96f56b6f: Merge "Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."" into klp-dev
* commit '8ea83e902d931591af37e747763e768e7a6990be':
  Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."
2013-11-21 17:16:26 -08:00
Michael Runge 90c60d3b92 Revert "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add."
This reverts commit 37335b4238.

Change-Id: I61cc125d3b08eaa300a7774b6607dbb43f0e7148
2013-11-22 00:52:51 +00:00
Geremy Condra fd6f7513f8 Add support for verity builds to the build system.
Change-Id: I3ef908d8d52ec88de453b161bbc3f198517a72f1
2013-11-17 16:09:34 -08:00
Michael Runge c5d3cb362c am 3b44339d: am 37335b42: Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
* commit '3b44339d6a443fde57db4ae84a7e46823da6d162':
  Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
2013-11-07 16:13:15 -08:00
Michael Runge 3b44339d6a am 37335b42: Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
* commit '37335b42385970d957d48056145a3d4c4dbc6087':
  Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
2013-11-07 15:00:42 -08:00
Michael Runge 37335b4238 Enable incremental builder to find files that moved, and
try to process them via patch + rename, instead of
delete + add.

b/11437930

Change-Id: Ie70632a2fa0a13d4bb259f61c620bb01812494e5
2013-11-07 11:36:03 -08:00
Mike Lockwood 31c3e00bb4 Disable recovery in PDK builds
Change-Id: Ic6ee44cef37104c8d7facc28dfe45d0ef832ebd0
2013-10-23 08:00:42 -07:00
Ying Wang 13871a8f50 resolved conflicts for merge of 65d5e788 to klp-dev-plus-aosp
Change-Id: Iad8793c5e53b239425e9bba1b6a925265ff8d130
2013-09-13 17:50:29 -07:00
Nick Kralevich 46f00b6167 am b5d4c0df: Merge "Update OTA to understand SELinux labels and capabilities" into klp-dev
* commit 'b5d4c0df503966f2a050af64dfa15c84f2e12c15':
  Update OTA to understand SELinux labels and capabilities
2013-09-10 13:14:54 -07:00
Nick Kralevich 0eb17d9447 Update OTA to understand SELinux labels and capabilities
Update the OTA generation script to understand SELinux file
labels and file capabilities.

Make fs_config aware of SELinux labels and file capabilities, and
optionally output those elements whenever we output the
UID / GID / file perms. The information is emitted as a key=value pair
to allow for future extensibility.

Pass the SELinux file label and capabilities to the newly created
set_metadata() and set_metadata_recursive() calls. When the OTA
script fixes up filesystem permissions, it will also fix up the SELinux
labels and file capabilities.

If no SELinux label and capabilities are available for the file, use
the old set_perm and set_perm_recursive calls.

Bug: 8985290
Bug: 10183961
Bug: 10186213
Change-Id: I4fcfb2c234dbfb965cee9e62f060092a4274d22d
2013-09-10 12:30:43 -07:00
Ying Wang c97e86dca8 am c62c92c3: Create an empty zip file if no dict file found.
* commit 'c62c92c3d737304cbd38e99e92f29e193b15b7c8':
  Create an empty zip file if no dict file found.
2013-08-28 18:43:32 -07:00
Ying Wang c62c92c3d7 Create an empty zip file if no dict file found.
Instead of touch an empty file.

Change-Id: Ifa8bb04cea6fc0fc3165337f6815d5976bac677d
2013-08-28 18:38:25 -07:00
Jianxun Zhang 098494981d Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS
The existing logic in common.py breaks string arguments incorrectly:
e.g. --para1 val1 --para2 "val2 is a string" will be output as:

'--para', 'val1, '--para2', 'val2' 'is' 'a' 'string'

This will cause mkbootimg command fails due to the invalid arguments
generated from the wrong parsing.

The patch fixes this issue to get:

'--para', 'val1, '--para2', 'val2 is a string'

Change-Id: Ia34ec357550f11ae9d6adc719d86a0c6a9099fbc
Signed-off-by: Jianxun Zhang <jianxun.zhang@intel.com>
2013-08-27 15:31:13 -07:00
Ying Wang a704583265 am 62c81f82: Collect NOTICE files for apps_only build.
* commit '62c81f821f3675ea57485bfa6cb3320b7178759e':
  Collect NOTICE files for apps_only build.
2013-08-26 15:04:13 -07:00
Ying Wang 8541895267 am b6cf5b2f: am b88ca53a: am ddce2eb0: am de32713f: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit 'b6cf5b2f41d460405a0a22812255b2700a79fb20':
  Collect and store proguard obfuscation dictionary files.
2013-08-26 15:01:13 -07:00
Ying Wang 62c81f821f Collect NOTICE files for apps_only build.
In apps_only build (after running tapas or exporting TARGET_BUILD_APPS),
run "make notice_files" to collect and combine the NOTICE files of
modules that are needed by the apps.

Bug: 10445634
Change-Id: I6555bba1104e43b48c723c82143c46d444a75e80
2013-08-24 13:55:59 -07:00
Ying Wang b6cf5b2f41 am b88ca53a: am ddce2eb0: am de32713f: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit 'b88ca53a465ef004a60ceb9c4c641c3c997edeb5':
  Collect and store proguard obfuscation dictionary files.
2013-08-23 12:19:48 -07:00
Ying Wang b88ca53a46 am ddce2eb0: am de32713f: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit 'ddce2eb007c97b8ca94bc7b3190a83006df0c187':
  Collect and store proguard obfuscation dictionary files.
2013-08-23 12:18:11 -07:00
Ying Wang ae9115a525 Collect and store proguard obfuscation dictionary files.
Collect and store proguard obfuscation dictionary files.
Only do this for apps_only build for now.

Bug: 9407666
Change-Id: I51c78bf0f42f959dc920de230e60e0f71ed0d0ea
2013-08-23 12:13:24 -07:00
Ying Wang 92ed0994d9 am c3e977ac: am 2363485c: am 06de9f94: am 8709497e: Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev
* commit 'c3e977acf150c54a73d7a4cd7f5d47474a122a66':
  Revert "Collect and store proguard obfuscation dictionary files."
2013-08-23 10:21:06 -07:00
Ying Wang c3e977acf1 am 2363485c: am 06de9f94: am 8709497e: Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev
* commit '2363485c2fb3f08d36e8cdbb2240b9c3993b470c':
  Revert "Collect and store proguard obfuscation dictionary files."
2013-08-23 10:17:47 -07:00
Ying Wang 7657012367 am 58ad7061: am 93b95dc4: am aa87a11d: am afd7457a: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit '58ad70618d4d21f16ffe89c1e0eea7e35eae918b':
  Collect and store proguard obfuscation dictionary files.
2013-08-23 10:17:36 -07:00
Ying Wang 2363485c2f am 06de9f94: am 8709497e: Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev
* commit '06de9f940c34b8ade1f1866fbc1c6b32f93277b4':
  Revert "Collect and store proguard obfuscation dictionary files."
2013-08-23 10:14:48 -07:00
Ying Wang 58ad70618d am 93b95dc4: am aa87a11d: am afd7457a: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit '93b95dc4b9f9b4e04e8a0fac25c958d5c52266e4':
  Collect and store proguard obfuscation dictionary files.
2013-08-23 10:12:26 -07:00
Ying Wang df8b48449a Revert "Collect and store proguard obfuscation dictionary files."
This reverts commit 41dbe1e535.

Change-Id: I023594779128083b75a069fd860cd29dd7951ef5
2013-08-23 17:11:18 +00:00
Ying Wang 93b95dc4b9 am aa87a11d: am afd7457a: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit 'aa87a11dffec0ea58c93ab0dd23b067975a4c681':
  Collect and store proguard obfuscation dictionary files.
2013-08-23 10:09:28 -07:00
Ying Wang 41dbe1e535 Collect and store proguard obfuscation dictionary files.
Collect and store proguard obfuscation dictionary files.
Only do this for apps_only build for now.

Bug: 9407666
Change-Id: I0324eed6bb236abb0d3725f8d2a0b6c5c31935fe
2013-08-22 20:54:31 -07:00
Ying Wang a3ee330ac5 am fa67740a: am 25977365: Merge "mkbootimg: Support custom mkbootimg implementation"
* commit 'fa67740ae41fc068d9a9b5fbf5a7a06c36dbbdb1':
  mkbootimg: Support custom mkbootimg implementation
2013-08-19 14:29:32 -07:00
Bjorn Andersson 612e2cd0e8 mkbootimg: Support custom mkbootimg implementation
Support using custom mkbootimg to allow boards to specify custom
boot image formats. Also export this as the environment variable
MKBOOTIMG to the *_from_target_files releasetools scripts.

Change-Id: I2084273b1175de097fb7da5c4f2264ea8014d74f
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
2013-08-09 16:29:02 -07:00
Ying Wang ad7fd29b31 Don't bother going through the source tree
Don't bother going through the source tree in more circumstances:
all cleaning goals, helping goals, no-deps goals.

Bug: 10244578
Change-Id: Id53a249085c62838e4193962a85e0ac34f46954f
2013-08-09 10:08:30 -07:00
Doug Zongker 1f790c9733 Merge "distinguish signed and unsigned user builds in UI" 2013-07-23 19:10:05 +00:00
Doug Zongker a8608a7f7c distinguish signed and unsigned user builds in UI
Add "dev-keys" or "test-keys" to the value of ro.build.display.id for
user builds.  (This is the property that is displayed under "Build
number" in the Settings UI.)  Modify the signing script to remove the
keys tag from this value when signing.

Change-Id: I3d9d92056f8567d7f84b1be047619be7c6e4c419
2013-07-23 11:51:04 -07:00
keunyoung 3939476ca0 Merge "add PDK_PLATFORM_ZIP_PRODUCT_BINARIES to allow adding product specific binaries to platform.zip" 2013-07-22 23:46:10 +00:00
keunyoung c01780611a add PDK_PLATFORM_ZIP_PRODUCT_BINARIES to allow adding product specific binaries to platform.zip
- This can be used to deliver stuffs like kernel symbol file.
- Files are added in relative path from the top of android source tree.
- PDK_PLATFORM_ZIP_PRODUCT_BINARIES will be defined in BoardConfig.mk.
- files under out dir will be rejected to prevent possible conflicts.

bug: 9963432
Change-Id: Id1da643534cd86939df4941f39e4414d343bba99
2013-07-22 15:59:33 -07:00
Michael Runge 065ab7f0df Merge "Revert "Update OTA to understand SELinux filesystem labels"" 2013-07-22 21:57:00 +00:00
Michael Runge fb9bb205fc Revert "Update OTA to understand SELinux filesystem labels"
This reverts commit fbbd79530a.

All incremental auto OTAs broken b/9964074

Change-Id: I500d2ac194804abd20a0e01d9862fd42e8f5d2de
2013-07-22 20:42:44 +00:00
Nick Kralevich f771d64bcb Merge "Update OTA to understand SELinux filesystem labels" 2013-07-18 22:25:59 +00:00
Nick Kralevich fbbd79530a Update OTA to understand SELinux filesystem labels
Make fs_config aware of SELinux contexts, and output the context
whenever we output the UID / GID / file perms.

Pass the selinux context to the set_perm2() and set_perm2_recursive()
calls. When the OTA script fixes up filesystem permissions, it will
also fix up the SELinux context on the files.

Bug: 8985290
Change-Id: I6419b64c06309a93ac6b2f2cf9fc7f8815adeaf3
2013-07-18 15:04:22 -07:00
Ying Wang 8bb3306b76 am a1f8cdf7: Merge "Allow several system property files"
* commit 'a1f8cdf74bcc35110bd306d633e019a6279fc7fe':
  Allow several system property files
2013-07-18 10:02:45 -07:00
Johan Redestig 674a27ddaf Allow several system property files
TARGET_SYSTEM_PROP now is a list of files and all of them
are included in the build.prop.

Change-Id: I494f86412b0a299ee4c066e49ab4f4686bc2178a
2013-07-16 15:15:16 +02:00
Ying Wang a0febe5e6d Support to build vendor.img
Bug: 8341435
Change-Id: I2db7970936984d38aed35054e3f695d298f4e512
2013-03-25 09:53:16 -07:00
Ying Wang d7321d31ac Skip userdata.img only if partition size is not give for extfs.
We still build yaffs2 images which don't need partition size.

Change-Id: I9c7f45069f25868666a257cee044faecf1a8781a
2013-03-15 10:32:29 -07:00
Ying Wang 4ac826b6d3 Don't build userdata.img if no partition size
And retire BOARD_DONT_BUILD_USERDATA_IMG.
This unifies the logic in build/core/Makefile and
build/tools/releasetools/img_from_target_files.

Change-Id: Ib6b4e8e0d8279ed7deaf047e9dc30eb65aba013f
2013-03-15 09:03:39 -07:00
Doug Zongker e12973258a recovery: choose between available fonts based on device density
Change-Id: I39aded4e1fb310d7e4b9c9ed3356686fcf62c002
2013-03-06 15:30:29 -08:00
Ying Wang 2e65cd5510 Don't install all host modules by default.
Instead we should explicitly set up the dependency, if the module will
be used in the build process; Use LOCAL_MODULE_TAGS with eng, debug or
tests if the module is for testing; or add to PRODUCT_PACKAGES if it's
required by a product.

Change-Id: Ic26319c26c1166bc1062dfbcfb4e006af185249a
2013-03-06 11:47:36 -08:00
Ying Wang 534fcd766e Allow to call dist-for-goals multiple times for the same file
You can dist the same file for multiple goals in multiple calls to
dist-for-goals. The first call will establish the real copy rule, while
the rest call just establishes the goals' dependency on the dest file.
This enable uss to remove the bizarre $(if ..) enclosing the droid and
sdk dist while avoiding make's multiple rules warning.

Change-Id: I76475db76a9e6167e0e606dd582b54e80dfcdd22
2013-03-01 16:51:26 -08:00
Ying Wang 6a42a25429 Run e2fsck only when building images with the target files.
With this change, e2fsck is run only when you build the update.zip file,
which is built when "dist" is among the make command.

Bug: 7591683
Change-Id: I446b71d5aa9295aff3af622f115175f769746615
2013-02-27 13:54:02 -08:00
Ken Sumrall 31ce31f607 Start producing target files using the unified fstab.
Change-Id: I6d9783fba3fcb4617323071bf924f50b66ad6935
2013-02-21 16:27:25 -08:00
Ying Wang fc1c1a217b am 71195ec7: am d01d0bf8: am 58a87c5c: Merge "core/Makefile: Allow specification of file locations"
* commit '71195ec71fe3498b19ff9ff8e4eb924b8fa507e6':
  core/Makefile: Allow specification of file locations
2013-01-04 17:50:46 -08:00
Ying Wang 61fc136d39 am a40166d1: am 5455455a: am a6f10400: am 7dc45a8b: Add simg2img and e2fsck to the otatools.
* commit 'a40166d11c597038b30eab6122f8967ee1c810b3':
  Add simg2img and e2fsck to the otatools.
2013-01-04 17:50:43 -08:00
Ying Wang 71195ec71f am d01d0bf8: am 58a87c5c: Merge "core/Makefile: Allow specification of file locations"
* commit 'd01d0bf86c2309a7a950549c9c124b303c0c3f82':
  core/Makefile: Allow specification of file locations
2013-01-04 15:30:28 -08:00
Ying Wang d01d0bf86c am 58a87c5c: Merge "core/Makefile: Allow specification of file locations"
* commit '58a87c5c010e474a1e321d3fe6ce1ad8267576b5':
  core/Makefile: Allow specification of file locations
2013-01-04 15:28:20 -08:00
Ying Wang a40166d11c am 5455455a: am a6f10400: am 7dc45a8b: Add simg2img and e2fsck to the otatools.
* commit '5455455a3e550821b381d061803133c82956d7ec':
  Add simg2img and e2fsck to the otatools.
2013-01-04 15:01:18 -08:00
Ying Wang 5455455a3e am a6f10400: am 7dc45a8b: Add simg2img and e2fsck to the otatools.
* commit 'a6f10400e16e80529e2dbbcd44742e55a99e0c3b':
  Add simg2img and e2fsck to the otatools.
2013-01-04 14:59:20 -08:00
Ying Wang 7dc45a8bdc Add simg2img and e2fsck to the otatools.
Change-Id: I31225399c6ef9cae38c825755e301fdc70ce194b
2013-01-04 14:43:18 -08:00
Andrew Boie fa61ff093e core/Makefile: Allow specification of file locations
If multiple build targets use a common recovery.fstab or system.prop,
this allows them to live in a centralized location and not be copied
or symlinked to the device directories.

Change-Id: I7aeb31ed9dc9b43a5e2c9e46fe582b10cba71b24
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2013-01-04 11:45:38 -08:00
Ying Wang c46bd076ff am ead4b642: am 5f97f2b6: am 6a6c1121: Run e2fsck on built sparse images.
* commit 'ead4b642cffe258e08326628af2c83c99c14df1f':
  Run e2fsck on built sparse images.
2012-12-18 23:09:09 -08:00
Ying Wang ead4b642cf am 5f97f2b6: am 6a6c1121: Run e2fsck on built sparse images.
* commit '5f97f2b6d6503eca8ae02ea8941fe1db7b6b399c':
  Run e2fsck on built sparse images.
2012-12-18 15:32:51 -08:00
Ying Wang 6a6c11215b Run e2fsck on built sparse images.
Bug: 7591683
Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46
2012-12-11 14:57:39 -08:00
Ying Wang 69e9b4d6d1 Run e2fsck on built sparse images.
Bug: 7591683
Change-Id: Id1cba79f7840aab1f0327cb741eda655b45d1b46
2012-11-27 09:57:17 -08:00
Ying Wang 9362c7ffdd Establish explicit dependency on selinux file_contexts.
Before this change, because the file_contexts is not in the system,
data or cache directory, the dependency is not reliable.
This fixed the gms build error:
out/target/product/gms/root/file_contexts: No such file or directory

Change-Id: Id8d5b3f4557d43a509ccc00b21dd426a414b7c42
2012-11-21 11:09:45 -08:00
Ying Wang fdbd9cbe2e Establish explicit dependency on selinux file_contexts.
Before this change, because the file_contexts is not in the system,
data or cache directory, the dependency is not reliable.
This fixed the gms build error:
out/target/product/gms/root/file_contexts: No such file or directory

Change-Id: Id8d5b3f4557d43a509ccc00b21dd426a414b7c42
2012-11-21 10:47:00 -08:00
Ying Wang 7bfda2c798 am 41824825: am 0d211eb9: Merge "Split to multiple bash commands."
* commit '4182482522c15e8268605a4e903951072df4756d':
  Split to multiple bash commands.
2012-10-26 10:57:24 -07:00
Ying Wang 4182482522 am 0d211eb9: Merge "Split to multiple bash commands."
* commit '0d211eb9f4a2bb508f7c0cc649faf99b4815bfc7':
  Split to multiple bash commands.
2012-10-26 10:54:52 -07:00
Ying Wang d9a88d585f Split to multiple bash commands.
This can fix the error "/bin/bash: Argument list too long", if we get a
really long apk list.
Bug tracker Link: http://code.google.com/p/android/issues/detail?id=38937

Change-Id: I72258125c4297dfd9f8f502a96dbfa5a08f3cc50
2012-10-26 09:40:07 -07:00
Mike Lockwood 0cbacc4b21 am 86e2fd92: am daf5e22d: Add new embedded target for a super minimal android build
* commit '86e2fd9215faaffed47ab0373b2955d9a1892113':
  Add new embedded target for a super minimal android build
2012-10-26 08:47:40 -07:00
Mike Lockwood 86e2fd9215 am daf5e22d: Add new embedded target for a super minimal android build
* commit 'daf5e22dbac03e174e22c8209ed97c44c3a2a2c9':
  Add new embedded target for a super minimal android build
2012-10-26 08:45:36 -07:00
Mike Lockwood daf5e22dba Add new embedded target for a super minimal android build
Remove obsolete BUILD_TINY_ANDROID

Change-Id: Ic0f3a5b3250ea80529f5099653068f118a13b12e
2012-10-25 15:28:37 -07:00
Kenny Root a7fa6a4607 resolved conflicts for merge of 37868329 to master
Change-Id: I437f42a7197d1716b4783749f2b27e19c8721395
2012-10-16 17:41:33 -07:00
Kenny Root 37868329b2 am 2e0d1af7: Merge changes I58d43128,Ie34c958f
* commit '2e0d1af767f64996f47de2a84b685ddcfa02e686':
  Remove HAVE_SELINUX guards, part 2
  Remove HAVE_SELINUX guard
2012-10-16 17:34:42 -07:00
Kenny Root 92ca0197ed Remove HAVE_SELINUX guards, part 2
Change-Id: I58d43128447ef3be0f70ff2479af2e61fe4c5849
2012-10-16 13:43:08 -07:00
Ying Wang e215ed52c6 Add BOARD_DONT_BUILD_USERDATA_IMG
So board config can choose to not build userdata.img.

Change-Id: I1e6024abb7806492468801e49075fa24c05d2dd1
2012-10-15 15:16:34 -07:00
Jean-Baptiste Queru b8c037ba5f Merge "Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building" 2012-10-05 13:32:11 -07:00
Ying Wang d0244b395a Remove build variant "tests"
Bug: 5368571
Now we have a phony target "tests" instead.
The target can be built in any other build variant (eg userdebug).
For example, "make PRODUCT-full-userdebug tests dist" will build and
put the *-test-* zip file in the dist dir.
The "tests" target will include all modules tagged as "tests" in
addition to other modules in specific target out directories.

Change-Id: I8383097380d8e6846c3e2107d6dd5f68788cfc39
2012-10-01 10:18:40 -07:00