Commit Graph

170 Commits

Author SHA1 Message Date
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
Jean-Baptiste Queru 228e8cf660 Add new vendors
Change-Id: Id0d3599257ae39077063bb5903c912526e02cb0e
2012-07-27 23:19:51 -07:00
Jean-Baptiste Queru a9e85effdd am ffbef646: am 74aba614: Allow additional vendors
* commit 'ffbef646d2bec4f84874bdc5940c3b060904cb3d':
  Allow additional vendors
2012-06-14 10:34:46 -07:00
Jean-Baptiste Queru 74aba61404 Allow additional vendors
Bug: 6611375
Change-Id: I07a1c4e56a2c9fdb1f2c8426977f1a8db0e4d4bb
2012-06-14 09:15:20 -07:00
Jean-Baptiste Queru 359264ae03 am c9f8b8d1: am 90beb4f1: Add some known binary owners
* commit 'c9f8b8d17ea17f722157aa58014dc1f1168996c1':
  Add some known binary owners
2012-06-05 09:55:14 -07:00
Jean-Baptiste Queru 90beb4f155 Add some known binary owners
Bug: 6611375
Change-Id: I082128ad15b277ced82c8530c17186842839a557
2012-06-05 08:08:06 -07:00
Nick Sanders 8b1b764812 am 3ccf7686: Move build.prop in factory bundle
* commit '3ccf7686757824e5e01944a369fc54baf76f95a4':
  Move build.prop in factory bundle
2012-05-17 23:53:01 -07:00
Nick Sanders 3ccf768675 Move build.prop in factory bundle
Move build.prop to the root dir of the factory bundle for clearer location access.

Change-Id: Ib9a49fd46eb943a1dc5e8e112462f9d601332ca3
Signed-off-by: Nick Sanders <nsanders@google.com>
2012-05-17 22:52:17 -07:00
Joe Onorato b30517897f Merge commit '54973dbc' into work
Conflicts:
	core/product.mk

Change-Id: Ib5eb6be09b34bdc04602e2a35a4bf7df0ba82aad
2012-05-17 22:15:22 -07:00
Joe Onorato e1d191ee95 Add rules to build the factory bundle.
Change-Id: I66bda914a5bd41bda7c8a4314f658924087e2bfb
2012-05-17 20:57:35 -07:00
Ying Wang 000e89a5b9 Strengthen dependencies on LOCAL_REQUIRED_MODULES
Bug: 6418863
This change expands the PRODUCT_PACKAGES with the required modules.
Before this change, since the required modules are not in the
PRODUCT_PACKAGES, they are not directly depended on by the image files.
If the dependent is not to be included in the image but the required
modules are to be included, the dependency of the image on the required
modules gets lost!
That would lead to build race condition.

Change-Id: I0b656db1538ca43d3785dbf17364ffa88b80ac41
2012-04-30 16:32:25 -07:00
Ying Wang 3024d2394f Strengthen dependencies on LOCAL_REQUIRED_MODULES
Bug: 6418863
This change expands the PRODUCT_PACKAGES with the required modules.
Before this change, since the required modules are not in the
PRODUCT_PACKAGES, they are not directly depended on by the image files.
If the dependent is not to be included in the image but the required
modules are to be included, the dependency of the image on the required
modules gets lost!
That would lead to build race condition.

Change-Id: Idbd504fd415b488c397e67ab487a22bff4fa188e
2012-04-30 15:48:27 -07:00
Jean-Baptiste Queru e1a42cc8bf Whitelist audience
Change-Id: I3a39f4bdc5c52e01b7d5d187e35b6fbf770756e2
2012-04-23 18:27:18 -07:00
Jean-Baptiste Queru dbff3f5b77 Whitelist widevine
Change-Id: I4863b335ebc02d642874a4dd3dd9a8af93455d7b
2012-04-13 13:37:56 -07:00
Nick Sanders 135c3af45a am df49771a: Allow factory specific kernel commandline
* commit 'df49771a4a82a147e287190f872ab9d0e237a69f':
  Allow factory specific kernel commandline
2012-04-06 14:11:10 -07:00
Nick Sanders df49771a4a Allow factory specific kernel commandline
* BOARD_KERNEL_CMDLINE_FACTORY_BOOT can be set to
add kernel commandline items to the factory ramdisk,
such as fiq_debugger.console_enable=Y

Change-Id: Iee4060b96eaeecc517975c56342fd5445b1feabf
Signed-off-by: Nick Sanders <nsanders@google.com>
2012-04-05 19:55:51 -07:00
Colin Cross bbd4998216 Add samsung_arm as an owner
Add samsung_arm as an owner to be used on files that depend
on licenses from both Samsung and ARM.

Change-Id: I03a5ba739b940915519f75477adea7c2a9b0a563
2012-03-28 09:34:28 -07: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
Nick Sanders 8f8f0d494e Add build.prop to factory ramdisk
We'll need a special case to set device properties on the factory ramdisk

Change-Id: I146d5c503e8c97005caa1ab1dbaca7ee9ab30faf
Signed-off-by: Nick Sanders <nsanders@google.com>
2012-03-23 10:51:32 -07:00
Mike Lockwood 1c06bc778c Merge commit '7d2ba7c' 2012-03-21 17:08:21 -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
Nick Sanders 756eda8b60 Add build.prop to factory ramdisk
We'll need a special case to set device properties on the factory ramdisk

Change-Id: I146d5c503e8c97005caa1ab1dbaca7ee9ab30faf
Signed-off-by: Nick Sanders <nsanders@google.com>
2012-01-30 19:25:21 -08:00
Brian Muramatsu 777e86a025 Merge "Avoid Rebuilding Core and VMTest Descriptions" 2012-01-11 11:32:17 -08:00
Conley Owens 8e0f7129fa Add a module_path_check for vendor files
When this is enabled we ensure that files from the vendor directory
get installed to /system/vendor/* instead of elsewhere in /system/*.

This changes the PRODUCT_RESTRICT_VENDOR_FILES variable
to accept "owner", "path", "owner path", or "all".
"true" will still only enforce vendor file owner restrictions.

Change-Id: I4598130a590ad56976e011f4cb2a9f5f227d5732
2012-01-10 15:45:40 -08:00
Brian Muramatsu c0a6924101 Avoid Rebuilding Core and VMTest Descriptions
Only generate the core test and vmtest descriptions when something has
actually changed rather than everytime CTS is built. This should make
iterative test development in CTS more pleasant.

The rule targets are changed to be the paths of the test description
XML files in a separate directory outside of the CTS distribution.
The buildCts.py rule copies these XMLs when they change to the
final CTS distribution location and creates the final plan file.

The dependencies have also been changed to reply upon the full
package paths rather than their phony targets to avoid rebuilding
everything all the time.

Finally, the AppSecurity rule was removed, because I have taken
care of that in my prior change to the Makefiles in the CTS
project.

Change-Id: I88b92c7a4cb4c2c2e20f06641e7ba0604d37f805
2012-01-05 18:44:16 -08:00
Nick Sanders 7d2ba7cff7 Add default kernel and base for factory ramdisk.
factory_ramdisk.img now is a real u-boot img containing
a kernel and memory offset metadata.

Change-Id: I9b4624eab8a6f769bb8bf0568484ee1865267c08
2012-01-03 13:30:30 -08:00
Jean-Baptiste Queru 89fbc541ad Add CSR to the list of known vendors
Change-Id: I978569e1be4c9d1d52d2b7fb7de2da4d4f616f39
2011-12-28 15:42:40 -08:00
Ying Wang 4c54b9fa2a We should include factory ramdisk if one shot makefile is NOT defined.
Change-Id: I711dbfb0d98a5e8a4d784d3ee6f3f9cfdc926209
2011-12-21 18:59:40 -08:00
Ying Wang 14eeea6708 We should include factory ramdisk if one shot makefile is NOT defined.
Change-Id: I92c7f26d13a05c4306c22b2e9e513cdd22e839ce
2011-12-21 18:54:36 -08:00
Ying Wang 9f0e3c9658 Disable factory ramdisk if build with mm/mmm
Because factory ramdisk build depends on the global view of all modules.

Change-Id: I5b35821cd287b70702191f3c30be6735d3339544
2011-12-21 16:24:30 -08:00
Ying Wang 9d5e83d331 Disable factory ramdisk if build with mm/mmm
Because factory ramdisk build depends on the global view of all modules.

Change-Id: I51de434e7800ac6e55b0eeca9394361e5e14cd55
2011-12-21 16:21:42 -08:00
Ying Wang 931a099a4c Fix multiple modules with the same name in FACTORY_RAMDISK_MODULES
With this change, if a module name is associated with multiple modules,
you can specify multiple install paths in
PRODUCT_FACTORY_RAMDISK_MODULES.
For example, if we have 2 modules named "foo", one is Java library and
the other is executable, then you can write:
PRODUCT_FACTORY_RAMDISK_MODULES += \
  foo:system/bin/foo:system/framework/foo.jar
Or:
PRODUCT_FACTORY_RAMDISK_MODULES += \
  foo:system/bin/foo \
  foo:system/framework/foo.jar

The build system will choose the correct built files based on the
install paths.

Change-Id: I6efc72e8abd1e81710ada16731b6792989aefd85
2011-12-21 13:50:06 -08:00
Ying Wang c16dbcd8c8 Fix multiple modules with the same name in FACTORY_RAMDISK_MODULES
With this change, if a module name is associated with multiple modules,
you can specify multiple install paths in
PRODUCT_FACTORY_RAMDISK_MODULES.
For example, if we have 2 modules named "foo", one is Java library and
the other is executable, then you can write:
PRODUCT_FACTORY_RAMDISK_MODULES += \
  foo:system/bin/foo:system/framework/foo.jar
Or:
PRODUCT_FACTORY_RAMDISK_MODULES += \
  foo:system/bin/foo \
  foo:system/framework/foo.jar

The build system will choose the correct built files based on the
install paths.

Change-Id: I6efc72e8abd1e81710ada16731b6792989aefd85
2011-12-21 11:30:59 -08:00
Ying Wang 0d75a0a54c Filter out static library in PRODUCT_FACTORY_RAMDISK_MODULES
If there is shared library with the same name.

Change-Id: Iaa43219cab7737c02a79d168f13ad4c473421f24
2011-12-20 17:36:26 -08:00
Ying Wang fc444cf7df Filter out static library in PRODUCT_FACTORY_RAMDISK_MODULES
If there is shared library with the same name.

Change-Id: I6c18ffc2a6c1f6d5b6468677cc420be817ea950d
2011-12-20 17:25:31 -08:00
Ying Wang 4b9d4ea2e2 Merge "Collect the GPL source files." 2011-12-16 17:00:46 -08:00
Ying Wang 89686538d7 Support to build factory ramdisk image.
Bug: 5769921

With this change, to build factory_ramdisk.img, set
PRODUCT_FACTORY_RAMDISK_MODULES in your product config.
PRODUCT_FACTORY_RAMDISK_MODULES consists of
"<module_name>:<install_path>" pairs.
<install_path> is relative to the root of the factory ramdisk output.
For example:
PRODUCT_FACTORY_RAMDISK_MODULES := \
    toolbox:bin/toolbox adbd:sbin/adbd adb:bin/adb

On the other hand you can use PRODUCT_COPY_FILES to copy prebuilt files
to the factory ramdisk.
Or you can define modules that are specific for the factory ramdisk
(with LOCAL_MODULE_PATH pointing to TARGET_FACTORY_RAMDISK_OUT) and add
the module names to PRODUCT_PACKAGES.

Change-Id: I80ff72606415cd74fe6f3bc93020a05d84e45b70
2011-12-16 13:54:10 -08:00
Brian Muramatsu 5fc0057b7d Stop Building CTS VM Tests
Bug 5728172

The VM tests were used with the old test runner.

Change-Id: I7ba819a394bb9643f937240ebd315d7d7820a8bf
2011-12-16 13:07:15 -08:00
Ying Wang 0a099d904a Support to build factory ramdisk image.
Bug: 5769921

With this change, to build factory_ramdisk.img, set
PRODUCT_FACTORY_RAMDISK_MODULES in your product config.
PRODUCT_FACTORY_RAMDISK_MODULES consists of
"<module_name>:<install_path>" pairs.
<install_path> is relative to the root of the factory ramdisk output.
For example:
PRODUCT_FACTORY_RAMDISK_MODULES := \
    toolbox:bin/toolbox adbd:sbin/adbd adb:bin/adb

On the other hand you can use PRODUCT_COPY_FILES to copy prebuilt files
to the factory ramdisk.
Or you can define modules that are specific for the factory ramdisk
(with LOCAL_MODULE_PATH pointing to TARGET_FACTORY_RAMDISK_OUT) and add
the module names to PRODUCT_PACKAGES.

Change-Id: I3778e3d091979261cb476628da1365f931e11f49
2011-12-16 11:33:01 -08:00
Conley Owens d497a1db71 Add several module owners to the whitelist
Change-Id: I9a215b74167efc2a6b3070dc8b616a289669d10f
2011-12-15 10:25:17 -08:00
Brian Muramatsu 393dde5525 resolved conflicts for merge of 80fa947b to master
Change-Id: I0febb15b690932ad342da4b10eb9c0f13d1d1517
2011-12-14 15:39:46 -08:00
Brian Muramatsu 237fa07339 Build Support for CTS Native Tests
Bug 4970300

Adds two new variables, CTS_TEST_CASES and CTS_TEST_XMLS, to be read
from CtsTestCaseList.mk. The CTS_TEST_CASES variable can be used to
copy any sort of file to the repository/testcases CTS directory.
The CTS_TEST_XMLS variable can be used to inject test package xmls
from any source rather than relying upon the monolithic and
mostly serial buildCts.py script.

The existing CTS_CORE_CASE_LIST is coded to only support APKs, so
it could not be retrofitted to support native tests. However, the
two new variables can do even more than CTS_CORE_CASE_LIST due to
their generality. In the future, the idea is move away from
CTS_CORE_CASE_LIST and also generate XMLs using separate tools
rather than just buildCts.py.

Change-Id: Ib52722861c37e0f4d511f9041928395bcaba5dea
2011-12-13 14:14:36 -08:00
Ying Wang dbb31be413 Restrict vendor modules to help AOSP product distribution.
Bug: 5692177

If you set "PRODUCT_RESTRICT_VENDOR_FILES := true" in a product
configuration, this changes restricts that:
- No overlays in the vendor tree.
- No PRODUCT_COPY_FILES coming from the vendor tree.
- Any referenced package with Android.mk in the vendor tree must have
  LOCAL_MODULE_OWNER set to a value that's compared against a whitelist
  stored in the core build system.

Change-Id: I172b84c7c853e9a04bf9879ea8dec90bd5054230
2011-12-12 14:17:55 -08:00
Ying Wang fd626f2d21 Collect the GPL source files.
Bug: 5693205
Change-Id: I045b83949f8b29d7c5cf5c0ab32c5b83cf398e71
2011-12-12 12:57:38 -08:00
Marius Renn b1df701ed8 Google Add-On API Documentation Fixes (5429077)
We no longer want a reference directory, but rather
maps_api and effects_api directories.

Change-Id: I72b3a342d0871ec4cf7010be0d2b6486ca83571b
2011-11-23 18:08:51 -08:00
Ying Wang a032d3d073 Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
Bug: 5429077
Change-Id: I8d962c803496479ba5b5e7316538aced65ee4df1
2011-11-11 10:52:12 -08:00
Brian Muramatsu 277be2fe0c Stop Packaging Old CTS Test Runner Files
Bug 5563917

This stops packaging the startcts script and the cts.jar into
the android-cts.zip. Since we are only testing using Tradefed,
we should prevent confusion by removing the old test runner.

Change-Id: I79f991617dd9e6a51a314207b4727cce3136d60f
2011-11-03 11:42:39 -07:00
David 'Digit' Turner becc3da915 resolved conflicts for merge of 2f2882a0 to master
Change-Id: Ia07eb9d022a8036c2b1674c591514740aa0d4596
2011-09-23 11:44:29 +02:00
David 'Digit' Turner 2f2882a04e am fdb13fcc: am 0cc5e1ef: Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread
* commit 'fdb13fccfecdf526549ad453a20e8136253edb51':
  sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
2011-09-22 23:01:17 -07:00
Brian Muramatsu 164285e05f am 8658fa51: am 9d014e65: am 9353a3be: Disable Dexpreopt for generic_arm5
* commit '8658fa51d15290cf43178d0633b53f11ff08a4aa':
  Disable Dexpreopt for generic_arm5
2011-09-09 12:04:27 -07:00