Commit graph

538 commits

Author SHA1 Message Date
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
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
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
Ying Wang
d222192fb0 Merge "Generate platfrom.zip for build goal "platform"." 2012-04-02 09:11:47 -07:00
Ying Wang
82b836fda6 Support to build pdk and pdk fusion.
Bug: 6241618
Change-Id: I08f74019631e9e132c15cdb2916bbafb052f9aa6
2012-03-30 18:57:52 -07:00
Ying Wang
4c289e5041 Generate platfrom.zip for build goal "platform".
Bug: 6241618
If platform appears on the build command line, build platform.zip,
which essentially is the zip package of the system directory.
Put the platform.zip to the dist dir if "dist" is specified too,
so the platform.zip can be downloaded from the build page.

Change-Id: I988dd5c753a4ee744b4e3dccf261d8df904d9847
2012-03-30 13:56:35 -07:00
Daniel Berlin
f5a97d7fbb Moving notice file generation to a python script
(it was getting fairly complicated in bash),
update HTML output to have a table of contents,
and fix typos/bugs in notice file CSS

Change-Id: I51131f594e3bbe63f03165fa42f5ceeaec518543
2012-03-30 15:08:59 -04:00
Brian Swetland
7a5960555b Introduce TARGET_BUILD_PDK for selecting build tweaks for the PDK
BUILD_PDK and some of the other infrastructure will go away once
we're done with the new new PDK work, but for now don't disturb
that stuff.

Change-Id: Ia39bf759ec03f203858ddcc4880af72bd132cb5a
2012-03-23 16:04:13 -07:00
Raphael Moll
74160ed4c4 SDK atree: support HOST_OUT location.
Change-Id: Ib369280971b37a3eb35ac94991cdbc49dead903e
2012-03-21 22:34:48 -07:00
Mike Lockwood
e8eb8df989 Merge commit 'c6e952f'
Don't build userdata.img for tests build.

Change-Id: I492cca5e5989cabdeb6f75c3b8a8c9ac3b9ca8c8
2012-03-21 17:01:18 -07:00
Steve Block
d14d3b4e64 Add a comment about publishing licenses for third-party code
Change-Id: I21bee0bb78ab42b4f7b6a938f94653c7e21e8503
2012-03-21 17:05:11 +00:00
Ying Wang
bf69aa32c9 Fix tests build.
Use the conditional only after the tests build variant is phased out.

Change-Id: Ide691700dda4bbf56c6f81f923d1b8c5eb196b85
2012-03-13 19:49:59 -07:00
Ying Wang
160b670f4a Add build goal "tests".
Bug: 5368571
The phony build goal "tests" will eventually replace the build variant
tests.

Change-Id: Ia656f2cf2260feeaa8fa32e9221b7f9ce0990262
2012-03-13 19:12:21 -07:00
Ying Wang
c5f049799c Remove system partition files from the test zip file.
Bug: 6157562
Change-Id: I581c6db7d47b42617f8ef6097ccd0aae52c7e1b4
2012-03-13 11:22:04 -07:00
Keun young Park
7fc7aad152 changes to add pdk1 / pdk2 build for PDK build
- additional files will be added to pdk/build
Bug: 6079146

Change-Id: Ieb5fcab8002193250d770b923f60ec7333ce84e5
2012-03-12 11:49:34 -07:00
Raphael Moll
3ab307a68c 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.

Change-Id: I9a1256548345fb866b0750fce6810913413dd946
2012-03-02 12:40:04 -08:00
Steve Block
495e58502a Revert "Remove unused notice_files target"
This broke the PRODUCT-sdk-(win_)sdk target of SDK builds

This reverts commit 620a5270fc.

Change-Id: I81afe68ae98b5daac5fe136ec8d04f6fba5af9b4
2012-02-29 20:09:09 +00:00
Steve Block
620a5270fc Remove unused notice_files target
The notice_files target generates $(TARGET_OUT_INTERMEDIATES)/NOTICE.txt and
$(TARGET_OUT_INTERMEDIATES)/NOTICE.html. The former is not needed and the
latter is an explicit dependency of $(TARGET_OUT_INTERMEDIATES)/NOTICE.html.gz.
We can therefore remove the target and the logic to generate NOTICE.txt.

Change-Id: I6179c049bebe590c7298e8be0a30e30265423468
2012-02-29 16:00:58 +00:00
Jean-Baptiste Queru
418027c87a am 41ab528f: am 99505268: am 20b970e2: Merge "Issue warning when "make snod" with dexpreopt enabled."
* commit '41ab528fe3533847fecddb0c6ee7884b17f35279':
  Issue warning when "make snod" with dexpreopt enabled.
2012-02-24 11:38:53 -08:00
Ying Wang
acf01ec837 Issue warning when "make snod" with dexpreopt enabled.
Change-Id: I481f963634dd384ed6d3de73dfeeda92b37d227e
2012-02-24 11:05:48 -08:00
Jean-Baptiste Queru
8f8624e61f am 9caacbd7: am 5ea72eff: Use the new location of the emulator kernel
* commit '9caacbd74328624dfc753cecfc42cb29bf14bfad':
  Use the new location of the emulator kernel
2012-01-06 17:41:07 -08:00
Jean-Baptiste Queru
5ea72effbd Use the new location of the emulator kernel 2012-01-06 17:02:24 -08:00
Jean-Baptiste Queru
7353e43b85 am da1c81ab: am a230c4d0: Reference kernel notice in the new location
* commit 'da1c81abe48c76f59953fd2e14a2ae2283d7bf92':
  Reference kernel notice in the new location
2012-01-06 15:22:50 -08:00
Jean-Baptiste Queru
a230c4d049 Reference kernel notice in the new location 2012-01-06 15:05:53 -08:00
Ying Wang
193010cc8f Print out ignored PRODUCT_COPY_FILES
So that people know their files are not really copied in accident.

Change-Id: I8fab920483230a9f349304dcbdb2fb9d60ee0215
2011-12-16 11:56:24 -08:00