Commit Graph

390 Commits

Author SHA1 Message Date
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 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
Ying Wang b301817223 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: I326e97df6630dee4acc6582ce6cef2dec8289155
2012-09-24 18:17:26 -07:00
Ying Wang 4b0486b4a6 Allow to tag owner to PRODUCT_COPY_FILES
PRODUCT_COPY_FILES now is a list of words like <source
path>:<destination path>[:<owner>].
The optional :<owner> is used to indicate the owner of a vendor file.

Bug: 7048854
Change-Id: I435d1e18b7a091fb62513062cfc2e420e51557ec
2012-09-20 16:37:55 -07:00
Ying Wang 7676611415 am 19c06156: am 0ee362ea: am 478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"
* commit '19c06156b6615ba53d81d2ecdc341c3feea21662':
  Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
2012-09-05 18:39:55 -07:00
Ying Wang 619fccf9f3 Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
Before setting up the rules.

Change-Id: Ifedbc0e988895a899cae315dc730a152bae91ae2
2012-09-05 18:09:49 -07:00
Doug Zongker 1a09726f68 fix possible build break
If you try to build a recovery image without having built the main
system, creating the recovery resourc file can fail due to the
directory not existing.

Change-Id: I2daff847c0b58dfa519d0f742636f01dba28c689
2012-09-04 14:45:11 -07:00
Doug Zongker 565888726b include recovery-resource.dat in /system/etc
Put the recovery UI images into a file in /system/etc where we can use
them for constructing the recovery image, so they don't need to be
included in OTA packages.

Change-Id: Iab2144865298c8967eb31660abd3bb11e6ec26fa
2012-08-20 15:38:58 -07:00
Andreas Makris ce7731af9f Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building
This patch adds BOARD_CUSTOM_BOOTIMG_MK. It is needed for some devices like
Sony Xperia S (LT26) because it needs a own bootimg format.
If BOARD_CUSTOM_BOOTIMG_MK is not set the build will be done in the normal
way, so other devices are not affected.

Change-Id: I66c8be6b107988d3238001e1dc612c044ed01aaa
Signed-off-by: Andreas Makris <andreas.makris@gmail.com>
2012-08-18 18:36:11 +02:00
Joe Onorato b68c3f9ca5 am 763c0801: am 687bde38: Merge "Add all the host tools to the list of prerequisites for the SDK."
* commit '763c080198655782cc5700d6f53cce330ab7e008':
  Add all the host tools to the list of prerequisites for the SDK.
2012-08-17 05:08:36 -07:00
Joe Onorato 63d56dad65 Add all the host tools to the list of prerequisites for the SDK.
Change-Id: I3a3e4be8796f761119e29f3be64ad534e48c95ee
2012-08-17 04:19:38 -07:00
Ying Wang bc415dd5eb Support to build emmap_mata.zip in unbundled builds.
Bug: 6987838
Change-Id: Id6c81b08c4859442b7d52054ed5f278575719d1a
2012-08-16 10:10:11 -07:00
Ying Wang f59a64b7cb am d3d0beca: am 392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES"
* commit 'd3d0becac9a13836b7c20acba3b21b0625d92324':
  Move the selinux modules to core PRODUCT_PACKAGES
2012-08-13 16:26:06 -07:00
Ying Wang 4150db6905 am d7547163: am 679b7498: Merge "Add mac_permissions.xml dependency."
* commit 'd7547163d5b0bf9e2cde626c0b7c6a58d48eb89e':
  Add mac_permissions.xml dependency.
2012-08-13 16:03:29 -07:00
Ying Wang 82ccebaa59 Move the selinux modules to core PRODUCT_PACKAGES
The module names are phony targets and we should avoid having file targets
depend on phony targets.
Instead the build system makes sure to use the file dependency with
PRODUCT_PACKAGES.

Change-Id: I8dc59d8f9ed92c146b8827d71278e27214e60f3a
2012-08-13 15:40:43 -07:00
Ying Wang 679b7498af Merge "Add mac_permissions.xml dependency." 2012-08-13 14:52:24 -07:00
Doug Zongker 72f0b67673 tidy up building of recovery ramdisk image
Copy init.recovery.*.rc files (if any) from the main system ramdisk,
and hide all the commands.

Change-Id: I4d4fcf25b66ddea70e43282d466983e9643c9bea
2012-08-09 08:56:01 -07:00
Colin Cross e98b836f26 Merge "recovery: don't delete hardware specific init*.rc files" into jb-mr1-dev 2012-08-08 17:53:38 -07:00
Ying Wang 9c649a7542 Don't install overridden packages in pdk fusion files.
Bug: 6942063
Change-Id: I14fc25b22b13bceeea8fa48491465233b19ab106
2012-08-08 15:36:43 -07:00
Jean-Baptiste Queru 7de61d1471 am 04363aa5: am af541a64: Merge "core/Makefile: also look for device/*/build/tasks"
* commit '04363aa5bd7ae0f2b5a8d09c25a83371933d0d12':
  core/Makefile: also look for device/*/build/tasks
2012-08-08 13:07:59 -07:00
Colin Cross 629c87b832 recovery: don't delete hardware specific init*.rc files
init used to automatically execute hardware specific init.rc files from
init.<hardware>.rc.  If the hardware specific init.rc file was installed
in recovery.img, various unwanted services would try to start, so init*.rc
was deleted when creating the recovery root directory.

init was recently modified to explicitly import init.${ro.hardware}.rc
from the default init.rc, rather than always trying to load it.  Since
recovery replaces the default init.rc with a custom one, it will never
try to load hardware specific init files.

In addition, there are cases where we need to start hardware specific
services, for example watchdogd, so we need
init.recovery.${ro.hardware}.rc to be installed.

Modify the build rule to delete the default init.rc from the recovery
root directory so it can be replaced with the custom recovery init.rc,
but leave all the hardware specific init files in place.

Bug: 6953625
Change-Id: I5d9555e3d54d2f1d9f49fb981bd412c53741337e
2012-08-08 13:04:58 -07:00
Jean-Baptiste Queru af541a64ab Merge "core/Makefile: also look for device/*/build/tasks" 2012-08-08 12:58:56 -07:00