Commit graph

360 commits

Author SHA1 Message Date
Ying Wang
7dc45a8bdc Add simg2img and e2fsck to the otatools.
Change-Id: I31225399c6ef9cae38c825755e301fdc70ce194b
2013-01-04 14:43:18 -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
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
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
Doug Zongker
d513160b76 add extra args to mkbootimg
Arrange to take $(BOARD_MKBOOTIMG_ARGS) and pass it to all invocations
of mkbootimg from within make, and to store it in the target_files so
it can be used by future invocations of img_from_target_files and
ota_from_target_files.

Bug: 6918260
Change-Id: I7130ac52e96bd51d4d8b80ca036635e1626f01f1
2012-08-02 15:03:41 -07:00
Keun young Park
722266918f add symbol files to PDK release for debugging
- app_process is not in PDK, and this makes native debugging difficult
  So provide symbol file instead of source

Bug: 6774048

Change-Id: I1a3a86cf64d8f1d22cdb3a22714f508de963099b
2012-08-01 12:49:01 -07:00
Ying Wang
7023f6179d Fix build.
Set BUILD_EMULATOR to true when HOST_OS is linux.
Disable the emulator package target if BUILD_EMULATOR is not true.

Change-Id: I8987c0a091622baa0e861b451e635c4ddb148b29
2012-07-27 09:57:36 -07:00
Ying Wang
7d8c535c1f Fix build.
Set BUILD_EMULATOR to true when HOST_OS is linux.
Disable the emulator package target if BUILD_EMULATOR is not true.

Change-Id: I8987c0a091622baa0e861b451e635c4ddb148b29
2012-07-26 15:12:21 -07:00
Nick Kralevich
07a06f6e44 am f0daadf6: am 297d6c02: Merge "Add property_contexts to SELINUX_DEPENDS."
* commit 'f0daadf6988c823355e9b59996e3dc798b7b7619':
  Add property_contexts to SELINUX_DEPENDS.
2012-07-25 15:05:58 -07:00
rpcraig
20b1d09593 Add mac_permissions.xml dependency.
Include the MMAC install perms policy configuration
file to the list of SELINUX dependencies.
This changes depends on the project:

git.selinuxproject.org/~seandroid/selinux/mac-policy

Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

Change-Id: Ief91d6a717741c91c5ba8745452bb247dc8048ec
2012-07-20 16:51:18 -04:00
Nick Kralevich
297d6c02bc Merge "Add property_contexts to SELINUX_DEPENDS." 2012-07-18 13:55:10 -07:00
Andrew Boie
f34a9bac0e core/Makefile: also look for device/*/build/tasks
This eases cross-repo dependencies between device/ and
vendor/.

Change-Id: I72e283d22f16e50555ec7ba7bcf9c61ea07f083c
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2012-07-17 10:22:30 -07:00
rpcraig
9e43f34840 Add property_contexts to SELINUX_DEPENDS.
This ensures there is a dependency between the root image
and changes to property_contexts file.
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

Change-Id: I9bd2c3fc44015d6013e6a1f200f8abded271654f
2012-07-05 10:50:27 -04:00
Ying Wang
6466147220 Don't build userdata.img in tests build.
Bug: 6035501

Change-Id: Ie1a0804f7fcc54383f2d8b97ac4583000e67cec5
2012-06-11 16:44:05 -07:00
Raphael Moll
748f9e3804 am b53a073d: am e375c940: Merge "SDK: Use "strip -x" for atree."
* commit 'b53a073ddb3a5036f41ea2956792991b7a46da02':
  SDK: Use "strip -x" for atree.
2012-06-07 13:08:58 -07:00
Raphael Moll
ec5fe91ead SDK: Use "strip -x" for atree.
Also fixes atree to accept an alternate command via the env var ATREE_STRIP
and correctly splits it for execvp if it contains arguments.

Change-Id: I8691bdc569bea3dddfde6249217dc305b6ef19f7
2012-06-06 23:39:47 -07:00
Ying Wang
28a1817590 Don't use .. to reference the target file.
Change-Id: I1d08db81c37853f5bf0bdf5dbe848634e6ae9f61
2012-06-02 09:22:31 -07:00
Keun young Park
3e93aeae10 add platform.zip from platform-java to dist
Change-Id: I08e110edf70ef5ec313ee02e03803fa152f0aa6a
2012-05-29 18:13:39 -07:00
Ying Wang
82eb7082aa Fix typo.
Change-Id: Id4b619e3fff8d801c4662d9cb2719576c370a503
2012-05-29 13:42:18 -07:00
Keun young Park
816b9fd4e2 enable PDK to use platform JAVA API
- make platform-java will add necessary Java stuffs from out/target/common/
  to platform.zip
- make platform works as before: no Java libraries
- normal fusion build will pick up the file, and define TARGET_BUILD_PDK_JAVA
  besides TARGET_BUILD_PDK if Java stuffs are included
- For TARGET_BUILD_PDK_JAVA, java.mk does not touch LOCAL_SDK_VERSION, which will lead into
  pulling non-SDK Java APIs

Bug: 6482799

Change-Id: I90b1a0b06dc774150711680a6612f2b97b9eab3f
2012-05-24 11:19:31 -07:00
Ying Wang
3ceecfa3da Check the well-formedness of an xml file before copying.
Bug: 6491991
Change-Id: I3dbf9a7e1fefd9fea2636c78a85bae63ea8391b8
2012-05-14 14:40:58 -07:00
Colin Cross
c312f31871 build: separate dist tools and ota tools
aapt is not needed for a dist build and not available in a pdk dist
build.  Create a new list DISTTOOLS that dist builds depends on,
and change OTATOOLS to be DISTTOOLS plus aapt, which is build by
make otatools.

Change-Id: I9a39020640b0e2cade8073aa14ee2ada9a20d78b
2012-04-19 13:54:39 -07:00
Colin Cross
4049130cba build: remove unused ota tools
genext2fs, tune2fs, and e2fsck are no longer used by mkuserimg.sh.

Change-Id: If3e9e846e021de0973bde2702e60acdc9f4c57c7
2012-04-19 13:29:27 -07:00
Keun young Park
782610165f enable recovery img build for PDK
Bug: 6363041
Change-Id: I25dff887dd0946c9506926e66e0514390c20692e
2012-04-19 09:55:24 -07:00
Colin Cross
dc8f8e4a75 Merge event-log-tags from platform.zip with local *.logtags
PDK fusion builds will include system/etc/event-log-tags from a full
build from platform.zip, which needs to be merged into the event-log-tags
built locally based on *.logtags from projects that have source.

Bug: 6297675
Change-Id: I91409f37c6dc88d6942eade2946155c2a6640b6f
2012-04-12 13:59:53 -07:00
Raphael Moll
b3700ab773 Merge "SDK: Also read sdk/build/tools.OS.atree"
This allows us to have per-host OS (or OS + arch) atree files in case we
need to get tools which source varies per host OS, example:
- sdk/build/tools.linux.atree
- sdk/build/tools.linux-x86_64.atree
- sdk/build/tools.windows.atree
etc.

(cherry picked from commit 3ab307a68c)

Change-Id: I05140bb02ecd41152e47ecdf404b1b8fb34fdf24
2012-04-10 12:21:46 -07:00
Ying Wang
4534d8135a Merge the NOTICE files when doing pdk fusion build.
Bug: 6297249
Change-Id: I693ab15e5a2eacda3c8b9d2ce36469ea177ae178
2012-04-10 10:02:02 -07:00
Kenny Root
883a122808 Merge "resolved conflicts for merge of a86fcc29 to master" 2012-04-09 15:12:58 -07:00
Kenny Root
f32dc71e49 resolved conflicts for merge of a86fcc29 to master
Change-Id: I3868c19bfd309b5b43b5642152a120931fe37315
2012-04-09 14:59:04 -07:00
Ying Wang
c4625abc5d Fix deps for notice generation.
With "foo bar : req", the build command will be run separately for foo
and bar.
Instead with "foo : bar" and "bar : req", the build command will be run
only once to produce both targets.
Also running the same build command concurrently may lead to build race
condition.

Change-Id: I8af2817546a7e2697a553c9320bd10f6bd4f20a2
2012-04-09 12:16:23 -07:00
Stephen Smalley
56882bf9b4 Support the setting of file security contexts in OTA and update packages.
Pass the file_contexts configuration to the releasetools scripts
so that the security contexts of files can be properly set for OTA
and update packages.

Requires Ica5fb73d6f2ffb981b74d1896538988dbc4d9b24

Change-Id: I5a63fd61a7e74d386d0803946d06bcf2fa8a857e
2012-04-06 15:35:41 -04:00
Stephen Smalley
5042392262 Pass the file_contexts configuration to mkyaffs2image and make_ext4fs.
This configuration is used to determine the file security contexts
to set on the files in the yaffs2 or ext4 image that is generated.
This is similar to the android_filesystem_config.h tables for determining
the UID/GID/mode, but as a configuration rather than code.

Change-Id: I7c6f59fe7cb8bc4c86c8790f991b12dd93a61f68
2012-04-06 15:34:37 -04:00
Ying Wang
3f45b3c35c Support to run DroidDoc in unbundled builds.
Change-Id: Ia5ace10ed75c451e346e289f0c534ad619abdb65
2012-04-02 18:32:05 -07:00
Ying Wang
406f69c8d6 Merge "Support to build pdk and pdk fusion." 2012-04-02 09:17:56 -07:00