Commit Graph

3324 Commits

Author SHA1 Message Date
Ying Wang de32713f47 Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev 2013-08-23 19:14:20 +00: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 27f2cfb72e am 29695daa: am 653a037d: am 638ce57a: Treat LOCAL_APK_LIBRARIES like shared Java libraries.
* commit '29695daa9734a8dfb516b7ff2e35b2b263e6b37b':
  Treat LOCAL_APK_LIBRARIES like shared Java libraries.
2013-08-23 12:10:20 -07:00
Ying Wang 29695daa97 am 653a037d: am 638ce57a: Treat LOCAL_APK_LIBRARIES like shared Java libraries.
* commit '653a037d70d770d2fc03d4f205a9c626af5f5c76':
  Treat LOCAL_APK_LIBRARIES like shared Java libraries.
2013-08-23 12:07:45 -07:00
Ying Wang 653a037d70 am 638ce57a: Treat LOCAL_APK_LIBRARIES like shared Java libraries.
* commit '638ce57a5848c10d781502bf198a2b93aeb58a7a':
  Treat LOCAL_APK_LIBRARIES like shared Java libraries.
2013-08-23 12:03:47 -07:00
Ying Wang 638ce57a58 Treat LOCAL_APK_LIBRARIES like shared Java libraries.
This fix proguard build.
Bug: 10307372

Change-Id: Id99d6e903077b4bacdea2e68cbb78e46a4a6afb8
2013-08-23 11:59:49 -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 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 06de9f940c am 8709497e: Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev
* commit '8709497ed82800f399e99516df59afdb1bae8472':
  Revert "Collect and store proguard obfuscation dictionary files."
2013-08-23 10:13:19 -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 c5b72527d3 am ec3c15e5: am 04c4d34d: am 7311a344: Make it easier to enable obfuscation and optimization.
* commit 'ec3c15e5c7c11cf3a831898f286c7eb7c216e50f':
  Make it easier to enable obfuscation and optimization.
2013-08-23 10:12:26 -07:00
Ying Wang 8709497ed8 Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev 2013-08-23 17:11:29 +00: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 ec3c15e5c7 am 04c4d34d: am 7311a344: Make it easier to enable obfuscation and optimization.
* commit '04c4d34d4fdb56c824abf39239d2c87806706b7e':
  Make it easier to enable obfuscation and optimization.
2013-08-23 10:09:27 -07:00
Ying Wang aa87a11dff am afd7457a: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit 'afd7457adf844692b5de8f8d7eefedcc10dc7da1':
  Collect and store proguard obfuscation dictionary files.
2013-08-23 10:06:59 -07:00
Ying Wang 04c4d34d4f am 7311a344: Make it easier to enable obfuscation and optimization.
* commit '7311a344bed507062e781ba70331d85652c217d8':
  Make it easier to enable obfuscation and optimization.
2013-08-23 10:06:58 -07:00
Ying Wang afd7457adf Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev 2013-08-23 17:05:32 +00: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 7311a344be Make it easier to enable obfuscation and optimization.
With this change, use:
* LOCAL_PROGUARD_ENABLED := obfuscation  # to enable obfuscation
* LOCAL_PROGUARD_ENABLED := optimization # to enable optimization
* LOCAL_PROGUARD_ENABLED := obfuscation optimization # to enable both

Now the meaning of the LOCAL_PROGUARD_ENABLED options:
* full:
    Use the build system's default configurations:
    with shrink but no obfuscation or optimization,
    global proguard flags in build/core/proguard.flags
    are applied.
* custom:
    The same as "full" except no aapt-generated resource-related
    proguard flags.
* nosystem:
    Don't use any build system's default configurations; but
    aapt-generated proguard flags are still applied. You are
    responsible for any other flags.
* disabled:
    Disable proguard.
* obfuscation:
    The same as "full" but with obfuscation enabled.
* optimization:
    The same as "full" but with optimization enabled.
* no value (the default):
    The build system chooses the proper value: "full" if it's an
    app; "disabled" if it's a library.

You can use more than 1 of them in a meaningful combination,
for example:
LOCAL_PROGUARD_ENABLED := obfuscation optimization

Bug: 10307372
Change-Id: Id248caca3048e99547f16559fae74f4afe85c354
2013-08-22 17:12:38 -07:00
Ying Wang a7deb0857c Add phony goal GET-INSTALL-PATH
It can be used as a goal of mm/mmm.
It prints out modules' install paths, which can be used by the runtest
utility.

Change-Id: If113e4c990b672acbacf723104583c0157d43c3b
2013-08-16 13:24:47 -07:00
Ying Wang 3208b615c5 am fc8b6338: resolved conflicts for merge of d65a7da3 to jb-mr2-dev-plus-aosp
* commit 'fc8b6338510690f1f87c57b9d9c470e25fc48bcd':
  No need to filter out AndroidConfig.h for unbundled build
2013-08-15 14:34:09 -07:00
Ying Wang fc8b633851 resolved conflicts for merge of d65a7da3 to jb-mr2-dev-plus-aosp
Change-Id: I14c4ddf5f02c8dec86f45bedf679bcebff1448dc
2013-08-15 12:02:30 -07:00
Ying Wang d65a7da320 am f4723fa4: No need to filter out AndroidConfig.h for unbundled build
* commit 'f4723fa49b6e61f727b6321a4006ee8ba3f393b9':
  No need to filter out AndroidConfig.h for unbundled build
2013-08-15 11:55:46 -07:00
Ying Wang f4723fa49b No need to filter out AndroidConfig.h for unbundled build
for now we have all AndroidConfig.hs in the build project.

Change-Id: Id713fecba1378fad81688f5937f61c779b618ac2
2013-08-15 11:01:10 -07:00
Ying Wang 66956dc063 am 396fd67d: am b9eee184: am e391e7a8: Remove -allowaccessmodification from the basic Proguard flags
* commit '396fd67d7a691a1226783f1b15442af86137eb3d':
  Remove -allowaccessmodification from the basic Proguard flags
2013-08-14 09:28:18 -07:00
Ying Wang 396fd67d7a am b9eee184: am e391e7a8: Remove -allowaccessmodification from the basic Proguard flags
* commit 'b9eee184f2ab291f5af6520c41f90a8857c4bd73':
  Remove -allowaccessmodification from the basic Proguard flags
2013-08-14 09:26:06 -07:00
Ying Wang b9eee184f2 am e391e7a8: Remove -allowaccessmodification from the basic Proguard flags
* commit 'e391e7a86e806bd3d2549b6d12736166fafb746f':
  Remove -allowaccessmodification from the basic Proguard flags
2013-08-14 09:22:01 -07:00
Ying Wang e391e7a86e Remove -allowaccessmodification from the basic Proguard flags
It seems with that flag Proguard modifies the class files in a way that
Dalvik does not like.
Bug: 10307364

Change-Id: If0cc7552da00ae8a3a3a39a9f2f029819ca3164a
2013-08-13 17:40:24 -07:00
Ying Wang 285045bd83 Support for LOCAL_HAL_STATIC_LIBRARIES
Now you can have a board config variable BOARD_HAL_STATIC_LIBRARIES,
which is a list of board-specific HAL static library names with pattern
"lib<library_name>.<board_specific_suffix>". LOCAL_HAL_STATIC_LIBRARIES
is a list of "lib<library_name>" and any matched
BOARD_HAL_STATIC_LIBRARIES will be added to the LOCAL_STATIC_LIBRARIES;
if no match is found, lib<library_name>.default will be used.

Bug: 10262105
Change-Id: Ic89d8d417d1dd65a227e4187a157fd3b77c4af34
2013-08-13 13:48:04 -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
The Android Automerger c618d4f100 Fix klp-dev build file 2013-08-08 07:47:58 -07:00
The Android Automerger 2a516ccce5 "KRS39B" 2013-08-08 07:39:23 -07:00
Mike Lockwood c73018c2e9 Fix typo from previous change to fix the build
Change-Id: I6cf7217eb81abd794339143b7c23456b68808caf
2013-08-06 16:15:48 -07:00
Mike Lockwood 6e5d867e30 Add support for overriding default Java libraries on a per-target basis
Change-Id: I425041554867a7ed7d74e1d603f160b2110bc86b
2013-08-06 15:07:18 -07:00
Ying Wang 4a0929e359 am 38775140: am 08c07c59: Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
* commit '387751401ca83e4419444247a176f2ea1f35a50b':
  Remove unnecessary dependencies between host and target modules.
2013-08-02 17:40:59 -07:00
Ying Wang 387751401c am 08c07c59: Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
* commit '08c07c590322e1cbc8464dd371a2e5120b88e38d':
  Remove unnecessary dependencies between host and target modules.
2013-08-02 17:39:01 -07:00
Ying Wang 2c86e70705 Merge "Don't check build prebuilt modules." 2013-08-02 20:31:53 +00:00
Ying Wang 883071ff1f Don't check build prebuilt modules.
Change-Id: I35bcd97cf41d1f6e0cdc2676a07127bff4f14e6d
2013-08-02 13:30:54 -07:00
Ying Wang ee9e88cf96 am a3827c4b: am 840f9d0a: Merge "Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt"
* commit 'a3827c4b6c1a4c5a1618515ccb8fc6692837ee71':
  Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt
2013-08-02 11:07:44 -07:00
Ying Wang a3827c4b6c am 840f9d0a: Merge "Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt"
* commit '840f9d0a274cffbef790dc20cd4f9eec27c3841b':
  Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt
2013-08-02 11:05:23 -07:00
Brian Carlstrom 5c619fcb5f Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt
Change-Id: I8be48114b43e46255977be1677b0c0bbccdf9163
2013-08-01 23:31:19 -07:00
Ying Wang 3670c8449a Split the product-graph build commands
1) As more product configuration files are added to the source tree, the
command line has become too long.
2) Escape "(" and ")" that may may appear in PRODUCT_MODEL.

Change-Id: I08f278dce434050f013498327c7cbf3592512460
2013-08-01 17:45:35 -07:00
Ying Wang 949c4eb073 Delete the kernel file when build config is changed
Now we have products of the same device type but with different kernel,
and we want to do incremental build on them.

Bug: 10133257
Change-Id: Iff4aae11e474d2822f02c62822bd028a5ba5b47a
2013-08-01 15:46:25 -07:00
Ying Wang 16b92edc38 Remove unnecessary dependencies between host and target modules.
With this change, modules introduced by LOCAL_REQUIRED_MODULES will be
split by host/target: target modules only depend on target modules and
host modules only depend on host modules.

Bug: 9303948
Change-Id: I4078a7983aa3c00e99534f3f170dfe4b66b12287
2013-07-31 20:00:45 -07:00
Ying Wang a8ae7f787d Error and exit if BUILD_MULTI_PREBUILT is incorrectly used
Bug: 10114476
Change-Id: Id51e7ca443c3742e17cbe114aefbb7ed3870b0e5
2013-07-31 16:26:01 -07:00
Ying Wang 172f5f5746 More verbose on what the build system is doing
Sometimes users get confused for long time of no message printed to the
screen.

Change-Id: I99d3b2954f3dcba47d5ee5dd9fd760578c0e0192
2013-07-31 12:22:57 -07:00
Jean-Baptiste Queru 8a7cd65585 am 50a402af: am f1534b62: Merge "Added generic hook for loading vendor specific defintions"
* commit '50a402af7ae550c96b9142ab56d3a23a8a8d22b1':
  Added generic hook for loading vendor specific defintions
2013-07-30 10:28:17 -07:00
Jean-Baptiste Queru 50a402af7a am f1534b62: Merge "Added generic hook for loading vendor specific defintions"
* commit 'f1534b6292a609bb5f55c4a617f3cd1054f90a81':
  Added generic hook for loading vendor specific defintions
2013-07-30 07:33:53 -07:00
Ying Wang 54d9cc3fac am cd9cadbc: am 7768c91c: am 94de1eba: Put a copy of the radio/bootloader files in the dist dir.
* commit 'cd9cadbcf68bfe07ac994e61aa00969572ae3fd5':
  Put a copy of the radio/bootloader files in the dist dir.
2013-07-26 13:00:20 -07:00
Ying Wang cd9cadbcf6 am 7768c91c: am 94de1eba: Put a copy of the radio/bootloader files in the dist dir.
* commit '7768c91c1c90e7c13390396d895a3afd5fda3e0f':
  Put a copy of the radio/bootloader files in the dist dir.
2013-07-26 12:57:19 -07:00
Ying Wang 7768c91c1c am 94de1eba: Put a copy of the radio/bootloader files in the dist dir.
* commit '94de1eba0e87297421789b339c5f26bf3e48eeb1':
  Put a copy of the radio/bootloader files in the dist dir.
2013-07-26 12:54:11 -07:00
Ying Wang 94de1eba0e Put a copy of the radio/bootloader files in the dist dir.
Bug: 10035750
Change-Id: I3b51e61ec737899d9264885a1e66c89a7a740d54
2013-07-26 12:19:20 -07:00
Marie Lennerhagen 9e5efceff9 Added generic hook for loading vendor specific defintions
Change-Id: I6dec9c378ed0aabf9e60f8dcb05c6043bbcc30e5
2013-07-26 18:12:36 +00:00
keunyoung a219bdc0ba fix build
- PDK_FUSION_OUT_DIR was null inside macro, lead into missing copy

bug: 10023069
Change-Id: I323d2fb6a2e955f9a7c27559701a7af36a89fea8
2013-07-25 18:22:43 -07:00
Ying Wang 5efaa72ac1 am 51aab877: am 5d1db8b4: Merge "Allow proto builds to pass in java proto params."
* commit '51aab8775ab86990abef411d00f5686e41022eee':
  Allow proto builds to pass in java proto params.
2013-07-25 17:04:20 -07:00
Ying Wang 51aab8775a am 5d1db8b4: Merge "Allow proto builds to pass in java proto params."
* commit '5d1db8b4335d554bfd7e028496f0305b78b0676b':
  Allow proto builds to pass in java proto params.
2013-07-25 15:36:07 -07:00
Ying Wang 7661c1d6f1 Merge "Add PRODUCT_BOOT_JARS to derive BOOTCLASSPATH" 2013-07-25 22:09:32 +00:00
Ulas Kirazci 6e485b545a Allow proto builds to pass in java proto params.
Change-Id: I65fe0cd96f818f59267da6159e6bd2ad28f07a11
2013-07-25 13:40:53 -07:00
Ulas Kirazci fcbc0b7f0b am 5094e33b: Merge "Revert "Allow proto builds to pass in java proto params.""
* commit '5094e33bddc5bb7ba8c63b725078764450b16973':
  Revert "Allow proto builds to pass in java proto params."
2013-07-25 13:35:27 -07:00
Ulas Kirazci 5094e33bdd Merge "Revert "Allow proto builds to pass in java proto params."" 2013-07-25 20:31:48 +00:00
Ulas Kirazci 24c7289d24 Revert "Allow proto builds to pass in java proto params."
This reverts commit 28b46fc16c.

Change-Id: Iaca9fa749c6f460911cc46e08e6b3ae2555b8bcc
2013-07-25 19:35:28 +00:00
Jean-Baptiste Queru 8959954976 am be581317: Merge "Change build id to OPENMASTER"
* commit 'be5813170364c382ca2fbc6500d567065449473e':
  Change build id to OPENMASTER
2013-07-25 09:07:19 -07:00
Chirayu Desai 0564d0ce33 Change build id to OPENMASTER
Change-Id: Ib1b2ea0303619753dace8a776295ad4e1ceab096
2013-07-25 21:26:32 +05:30
Ben Murdoch fc2bad5c36 Revert "Allow proto builds to pass in java proto params."
This reverts commit 28b46fc16c.

Speculative fix for master builds. I cannot repro the break the bots
are seeing locally, but it seems related to building protobufs and this
CL was in the first broken build.
2013-07-25 11:44:53 +01:00
Ulas Kirazci dd3d8f4ca9 am 6a5fc54f: am a825aa13: Merge "Allow proto builds to pass in java proto params."
* commit '6a5fc54fe9904214a7df1d34c9d48ad0310d867e':
  Allow proto builds to pass in java proto params.
2013-07-25 00:47:09 -07:00
Ying Wang 9352474dae am 6f9c87ed: am 45339b01: Merge "Use consistent search depth."
* commit '6f9c87ede60c52a42b107fa5fb06e0f2f654ca9f':
  Use consistent search depth.
2013-07-25 00:47:08 -07:00
Ulas Kirazci 6a5fc54fe9 am a825aa13: Merge "Allow proto builds to pass in java proto params."
* commit 'a825aa1329cbf28e23a9f7d96dbbe16f3f7ef9db':
  Allow proto builds to pass in java proto params.
2013-07-25 00:44:07 -07:00
Ying Wang 6f9c87ede6 am 45339b01: Merge "Use consistent search depth."
* commit '45339b01d61586aa46c4ca98b37e320879fac050':
  Use consistent search depth.
2013-07-25 00:44:07 -07:00
Ulas Kirazci a825aa1329 Merge "Allow proto builds to pass in java proto params." 2013-07-25 03:04:10 +00:00
Ying Wang 45339b01d6 Merge "Use consistent search depth." 2013-07-25 01:54:44 +00:00
Ulas Kirazci 28b46fc16c Allow proto builds to pass in java proto params.
Also source files which have dependencies need to be bundled together
(at least the way the build system is set up now). Move
--proto_path=$(TOP) to the end so that it does not take precedence
over user-supplied --proto_path flags.

Change-Id: Ia532647fe8811d39230a23ba3671685b0388cbe0
2013-07-24 18:02:57 -07:00
Scott Main c3faf216a4 am c5b665ad: am 0ce71df0: Merge "remove renderscript support lib from javadocs" into jb-mr2-ub-dev
* commit 'c5b665addf7f6a6ca7225b8f75bf419ada2ce74c':
  remove renderscript support lib from javadocs
2013-07-24 16:27:49 -07:00
Scott Main c5b665addf am 0ce71df0: Merge "remove renderscript support lib from javadocs" into jb-mr2-ub-dev
* commit '0ce71df0fccdb10c36823307fad7a71c7cd4d4d4':
  remove renderscript support lib from javadocs
2013-07-24 16:20:04 -07:00
Ying Wang 0650d1503d Add PRODUCT_BOOT_JARS to derive BOOTCLASSPATH
- BOOTCLASSPATH now is product-configurable;
- No need to maintain the duplicate values in core/dex_preopt.mk.
- clean up some legacy ALL_PREBUILTs.
Bug: 9990214

Change-Id: Ie3953e66d282e335bb7782b0ebd56102c35ec10e
2013-07-24 15:15:55 -07:00
Keun-young Park efc88c0596 Merge "Fix issue with DEBUG_OUT_DIR not properly selected" 2013-07-24 22:06:49 +00:00
Tom Cherry 60767620c3 Fix issue with DEBUG_OUT_DIR not properly selected
- patch from NVDIA

bug: 9968564

Change-Id: I2082f989d75fb168fb42947d723de093beff4ff1
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Reviewed-by: Simone Willett <swillett@nvidia.com>
2013-07-24 13:55:56 -07:00
Scott Main 5b743677eb remove renderscript support lib from javadocs
Change-Id: I6b06bdcdae79442dbf471816cd1cf6f90873f1b2
2013-07-23 21:00:50 -07:00
Doug Zongker 1f790c9733 Merge "distinguish signed and unsigned user builds in UI" 2013-07-23 19:10:05 +00:00
Guilhem IMBERTON 58570e7d5e Use consistent search depth.
AndroidProducts.mk allows for a maxdepth of 4 in device and vendor while
vendorsetup.sh and BoardConfig.mk only allow for smaller depth.

Make search depth consistent for these files.

Change-Id: I406770c1423d4f27fe097956a7c705a0da937e35
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Laurent Fert <laurent.fert@intel.com>
Signed-off-by: Guilhem Imberton <guilhem.imberton@intel.com>
Author: Laurent Fert <laurent.fert@intel.com>
2013-07-23 21:02:15 +02: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
Ying Wang 15cbe8e3d4 Add framework2 to the java pdk package.
To fix pdk fusion build.

Change-Id: I5989f38e48614faa742f8362bde841fe084d9c13
2013-07-19 14:37:25 -07:00
Nick Kralevich f771d64bcb Merge "Update OTA to understand SELinux filesystem labels" 2013-07-18 22:25:59 +00:00
Jeff Brown 4e361bf692 Merge "Split framework jar." 2013-07-18 22:12:37 +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 8bf79bb081 am 8bb3306b: am a1f8cdf7: Merge "Allow several system property files"
* commit '8bb3306b76bf3a20fc0f0634a492c5c18550c8e3':
  Allow several system property files
2013-07-18 10:07:09 -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
Jeff Brown ae859f9b64 Split framework jar.
Change-Id: I38c68ac169a4ea10e4640b5d8e24298a6caaf441
2013-07-17 21:08:18 -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
Brian Carlstrom 8abff76d8f Add LOCAL_ADDITIONAL_DEPENDENCIES support to BUILD_PHONY_PACKAGE
Change-Id: I0211600ebb554b55f3823a4cb3d119b95cb49733
2013-07-15 16:44:26 -07:00
Ying Wang 6e9151b1a7 am 988251c9: Fix error.
* commit '988251c92269676c891dcb548fecdc100755b431':
  Fix $(so_suffix) error.
2013-07-15 09:01:59 -07:00
Ying Wang 988251c922 Fix $(so_suffix) error.
Change-Id: I32cb4d4efe0a473e67a54c035df4dd82b6e4a3f0
(cherry picked from commit 80b71fa326)
2013-07-15 15:57:25 +00:00
Ying Wang 80b71fa326 Fix $(so_suffix) error.
Change-Id: I32cb4d4efe0a473e67a54c035df4dd82b6e4a3f0
2013-07-15 08:47:33 -07:00
Ying Wang 3aa8eb6810 am ba9636d4: Establish the built module dependencies on prebuilt shared library
* commit 'ba9636d47fdc91c4caca6c9e0ad618956ddbb98b':
  Establish the built module dependencies on prebuilt shared library
2013-07-12 22:34:46 -07:00
Ying Wang ba9636d47f Establish the built module dependencies on prebuilt shared library
This is needed because the linker command line uses -rpath-link with
built module path ($(*_OUT_INTERMEDIATE_LIBRARIES)) to search for indirect
dependency libraries.

Change-Id: I21d537c7c697dfb18df25d3d2bb7bffe2f9d370f
(cherry picked from commit ada8f29657)
2013-07-13 05:31:11 +00:00
Ying Wang ada8f29657 Establish the built module dependencies on prebuilt shared library
This is needed because the linker command line uses -rpath-link with
built module path ($(*_OUT_INTERMEDIATE_LIBRARIES)) to search for indirect
dependency libraries.

Change-Id: I21d537c7c697dfb18df25d3d2bb7bffe2f9d370f
2013-07-12 22:05:14 -07:00