Commit Graph

601 Commits

Author SHA1 Message Date
Deepanshu Gupta 8723f9e212 Merge "Integrate build_font.py" into lmp-preview-dev 2014-06-07 23:33:12 +00:00
Ying Wang e8dc18680f am dc7ff054: am bc080d51: am 2a386e0c: Allow to build the update.zip for emulator build.
* commit 'dc7ff05427e885a59e8884e0f8e10a6c78f2842b':
  Allow to build the update.zip for emulator build.
2014-06-04 17:30:32 +00:00
Ying Wang dc7ff05427 am bc080d51: am 2a386e0c: Allow to build the update.zip for emulator build.
* commit 'bc080d510f022da8055b89b85e02d91e74c3757d':
  Allow to build the update.zip for emulator build.
2014-06-04 17:26:00 +00:00
Ying Wang 2a386e0cfb Allow to build the update.zip for emulator build.
img_from_target_files.py just skips the boot.img and recovery.img since
there is no kernel or recovery.fstab for emulator.

Bug: 15383279
Change-Id: I4035193e6ab933194ff1417dfae4eab963fe5301
2014-06-04 17:04:14 +00:00
Ying Wang f8824aff68 Allow to build the update.zip for emulator build.
img_from_target_files.py just skipps the boot.img and recovery.img since
there is no kernel or recovery.fstab for emulator.

Bug: 15383279
Change-Id: I4035193e6ab933194ff1417dfae4eab963fe5301
2014-06-03 14:07:27 -07:00
Ying Wang e3e421f851 Move sdk staging dir to a product-specific dir
So we can do incremental build across different SDK products.

(cherry picked from commit d7af176199)

Change-Id: I30ebed5328123629519a64c793f94fc8d5aa09a8
2014-06-02 18:32:54 -07:00
Ying Wang 9c777b3718 am dfafee3b: am 7f349dc9: am 40b7e342: Merge "Move sdk staging dir to a product-specific dir"
* commit 'dfafee3b782cc48562126b9c4748cfa2f49f3158':
  Move sdk staging dir to a product-specific dir
2014-06-03 01:27:55 +00:00
Ying Wang dfafee3b78 am 7f349dc9: am 40b7e342: Merge "Move sdk staging dir to a product-specific dir"
* commit '7f349dc968a3fc76f48e1e199f1036b40e582851':
  Move sdk staging dir to a product-specific dir
2014-06-03 01:25:23 +00:00
Ying Wang 7f349dc968 am 40b7e342: Merge "Move sdk staging dir to a product-specific dir"
* commit '40b7e34240be756bbf1542b63eef6332024d067e':
  Move sdk staging dir to a product-specific dir
2014-06-03 01:22:51 +00:00
Ying Wang d7af176199 Move sdk staging dir to a product-specific dir
So we can do incremental build across different SDK products.

Change-Id: If3f082e4b92d00e7ccda980610e1d967d44da622
2014-06-02 16:16:53 -07:00
Nick Kralevich bf9f0712f2 am 46c48a0c: am 1df5b37b: am 61cf065a: Merge "Use a separate policy for the recovery image."
* commit '46c48a0c34dfafde4cd55956ffbb9251a1cdac02':
  Use a separate policy for the recovery image.
2014-05-30 19:01:37 +00:00
Nick Kralevich 46c48a0c34 am 1df5b37b: am 61cf065a: Merge "Use a separate policy for the recovery image."
* commit '1df5b37b5b73324300ae1b5f255c1a772c65328a':
  Use a separate policy for the recovery image.
2014-05-30 18:27:03 +00:00
Nick Kralevich 1df5b37b5b am 61cf065a: Merge "Use a separate policy for the recovery image."
* commit '61cf065ae9247a200208dc7df0234e03caff3605':
  Use a separate policy for the recovery image.
2014-05-30 18:23:41 +00:00
Deepanshu Gupta 9eebd78f6e Integrate build_font.py
Executle the build_font.py script to rename the PS name of the fonts to
be shipped with the SDK.

Change-Id: I14f8a27b9da8d4aa7b9d2773cf4aa84c6f3c22fe
2014-05-30 10:29:34 -07:00
Stephen Smalley 5520f28653 Use a separate policy for the recovery image.
Only the recovery image needs to include the recovery domain
in its policy, so create a separate policy for the recovery image
and replace the root policy with this one when building the
recovery image.

Depends on the change with the same Change-Id in external/sepolicy.

Change-Id: I444107f9821eabf4164ba07a44d03bd71e719989
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-05-29 16:42:49 -04:00
Yuncheol Heo 623d706253 Fix the path for findbugs.
Change-Id: I45485f1aeaf7fc3db2839f42829278d8c0ec97e3
2014-05-20 17:13:34 +09:00
Doug Zongker 9843fd8489 add missing verity tools to otatools target
Change-Id: I856e43ac9757cf082548646e50db8bbc8da71d0a
2014-05-13 14:18:47 -07:00
Doug Zongker 8eaeea95d5 improve density selection of recovery assets
Some recovery UI assets are available in different sizes; we need to
pick the right ones for the device's density.  Use
PRODUCT_AAPT_PREF_CONFIG if it is available (it is empty for older
devices), and fall back to the highest density in PRODUCT_AAPT_CONFIG
if the PREF_ version is not available.

Change-Id: Ia1eb7d5409cda17b0fc5c0bcfc33dfa6a50893e8
2014-05-12 15:38:57 -07:00
Geremy Condra c10320eef3 Merge "Add verity support to `make dist`." 2014-05-12 17:00:58 +00:00
Geremy Condra 5b5f4958d8 Add verity support to `make dist`.
Without this, system images will be built that do not contain the
necessary bits for verification.

Change-Id: I87c15282b26377d7a2a1540e3d0e30b0299622e3
2014-05-10 18:31:07 -07:00
Ed Heyl 0cd5ec5b16 Merge "Fix build: Revert "Add verity support to `make dist`."" 2014-05-09 05:58:28 +00:00
Ed Heyl 3e92fd0fba Fix build: Revert "Add verity support to `make dist`."
This reverts commit 5dee206d8e.

Change-Id: I6f4f536c127d3e5dcb6594efb193231cd8dece7e
2014-05-09 05:53:54 +00:00
Xavier Ducrohet 7b967dc13f am a6a2969e: Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus-aosp
* commit 'a6a2969e020ea16edbe24661d2b63f7f2bdf98b6':
  Remove SDK Tools from platform builds.
2014-05-09 02:13:32 +00:00
Xavier Ducrohet a6a2969e02 Resolved conflicts for merge of 05a7a955 to klp-modular-dev-plus-aosp
Change-Id: Ife0d1ef3d5a0cb4b91c8b813d259c947c85018f8
2014-05-08 18:48:26 -07:00
Geremy Condra c921b1eb19 Merge "Add verity support to `make dist`." 2014-05-09 01:39:44 +00:00
Xavier Ducrohet 05a7a955c1 am afe444a5: Merge "Remove SDK Tools from platform builds."
* commit 'afe444a564ed72cdda792822a0c9dab57a8c9172':
  Remove SDK Tools from platform builds.
2014-05-09 00:52:34 +00:00
Xavier Ducrohet afe444a564 Merge "Remove SDK Tools from platform builds." 2014-05-09 00:46:45 +00:00
Ying Wang af3f1a5454 am d6214b31: am 0d4b3df6: Merge "Target "tests" now only builds the modules tagged as "tests""
* commit 'd6214b3161161faf63a60b3ad3f595569a481192':
  Target "tests" now only builds the modules tagged as "tests"
2014-05-09 00:10:43 +00:00
Ying Wang d6214b3161 am 0d4b3df6: Merge "Target "tests" now only builds the modules tagged as "tests""
* commit '0d4b3df6aa495ab2aaabe3a8d5c9c6ad69ab5667':
  Target "tests" now only builds the modules tagged as "tests"
2014-05-09 00:06:36 +00:00
Ying Wang 07b2055d3e Target "tests" now only builds the modules tagged as "tests"
But not install them.
This prevents "make tests" polluting system.img or userdata.img.
We have new mechanism to build and package up modules into zip file in
build/core/tasks/tools.
Change package-modules.mk to install DATA/ instead of data/ in the
zip file; Better handle of module name conflicting.

Bug: 13585955
Change-Id: I7586a8c7995b984c9ead0ba2fa84dd5d2dd20bd1
2014-05-08 17:01:25 -07:00
Ying Wang 571fee8985 Target "tests" now only builds the modules tagged as "tests"
But not install them.
This prevents "make tests" polluting system.img or userdata.img.
We have new mechanism to build and package up modules into zip file in
build/core/tasks/tools.
Change package-modules.mk to install DATA/ instead of data/ in the
zip file; Better handle of module name conflicting.

Bug: 13585955
Change-Id: I7586a8c7995b984c9ead0ba2fa84dd5d2dd20bd1
2014-05-08 14:52:39 -07:00
Xavier Ducrohet 51e303a281 Remove SDK Tools from platform builds.
(cherry picked from commit edf30221b4890673dc714a1efef3b5faf4ae1522)

Change-Id: Ia74c2ece1528adca10a4eec24e73b4ce361af1a9
2014-05-08 14:50:15 -07:00
Geremy Condra 5dee206d8e Add verity support to `make dist`.
Without this, system images will be built that do not contain the
necessary bits for verification.

Change-Id: Icaa636085dbfd386424c90dfbe404c5960df0fe4
2014-05-06 18:06:18 -07:00
Colin Cross e8eef02cca Merge "verity: switch to C++ version of build_verity_tree" 2014-05-02 23:52:16 +00:00
Michael Runge 6e836116f7 Add support for verifying OEM properties.
A separate OEM file must be specified to provide the expected
values for these properties.  The list of properties comes from
the "oem_fingerprint_properties" list in misc_info.txt

Bug: b/13367676

Change-Id: I1a3eaf108492132cf6f595a5d1c9f7e0c3cb3142
2014-05-01 17:37:57 -07:00
Bill Yi 1e4adfa837 Merge commit '8113e43601aac7702b9ec007e81a179826143d1e' into HEAD 2014-04-29 11:32:53 -07:00
Colin Cross 477cf2b029 verity: switch to C++ version of build_verity_tree
The C++ version avoids the need to unsparse the image to generate
the verity image, and is much faster for images with large regions
of don't care (treated as zeroes).

Change-Id: I8396b08a5fdb93f27d8c71c9c1ac23cb75cf1f7f
2014-04-28 17:19:13 -07:00
Colin Cross 8a30f72c0c verity: clean up verity build dependencies
Move image dependencies out of PRODUCT_PACKAGES and into direct
dependencies for the image building rules.

Fix the test for PRODUCT_SUPPORTS_VERITY, it needs to check for
the current project as the global is no longer set.

Change-Id: I811501834ae5ec658229bd505fcc48275ff578c9
2014-04-28 17:19:04 -07:00
Ying Wang b8888432f0 Set up rules to build oem.img
To build oem.img:
- You must define BOARD_OEMIMAGE_PARTITION_SIZE in your BoardConfig.mk
- The file system type will be the same as system.img and userdata.img.
- To install a module to oem.img, use "LOCAL_OEM_MODULE := true"
- run "make -j48 showcommands oem_image dist". By default it's not
  built.

Bug: 13367676
Change-Id: I1a26d4d0c61b72ecffe60279667b1b3de050780d
2014-04-28 09:43:51 -07:00
Dianne Hackborn 6ee3c4327d Add new facility to have multiple active codenames.
Use this to have both L and KKWT.

Change-Id: I78cd5ed2dcffab9e93030184ba6f9eb9a6a3cba5
2014-04-24 16:19:14 -07:00
Ying Wang 51f0d3f58a resolved conflicts for merge of 70555a16 to master
Change-Id: Ibb8ea3159e2a3fa7a70f2359a02c4625812995a8
2014-04-15 13:55:24 -07:00
Ying Wang 70555a1677 am fcd22c88: Merge "Allow to build target-files.zip in sdk build." into klp-modular-dev
* commit 'fcd22c8848b829eec7e661fb270fea1a18bcba28':
  Allow to build target-files.zip in sdk build.
2014-04-15 16:12:26 +00:00
Ying Wang 4709d7c3a5 Allow to build target-files.zip in sdk build.
and put the target-files.zip on the build server.

Bug: 13763122
Change-Id: I71ab6aa40666fdb24ec0da0fbfc7b73753d4f0c7
2014-04-14 17:25:43 -07:00
Jeff Sharkey 26e1a28e7f Pass OEM property list to OTA tools, thumbprint.
The OTA generation scripts need to know what system properties to
read from the OEM partition, so pass along from product definition.

Also define "thumbprint" which is only the build-specific parts of
the fingerprint.  (Thumbs are smaller than fingers.)

Bug: 13367676
Change-Id: Iae051dcd2b1c67a7c8554d8ae318a4c54a86d614
2014-04-09 15:00:36 -07:00
Jeff Sharkey 491055df99 Merge "Import OEM build properties, if defined." 2014-04-09 15:44:06 +00:00
Narayan Kamath 110ea46e09 resolved conflicts for merge of 8af7e8ed to master
Change-Id: Ib427b36e133e29d1c2e9cea065e4e63c1e2e2122
2014-04-09 12:33:03 +01:00
Narayan Kamath 8af7e8ed3e resolved conflicts for merge of 1852237a to klp-modular-dev-plus-aosp
Change-Id: I09a8a4e95fc956392a0c61f38bd12332149a8d96
2014-04-09 10:03:41 +01:00
Narayan Kamath 7303ebda84 Add 32 / 64 bit abi lists to system properties.
Introduce ro.product.cpu.abilist32 / abilist64, which are
comma separated lists of the 32 and 64 bit ABIs that the
device supports. These properties are used by the zygote and
system server to determine what ABI an app should be
started with.

This changes move abilist related make steps out of envsetup.mk
and into config.mk because they depend on variables set by
core/combo/***. Additionally, config.mk performs a few additional
cleanups of these variables (like stripping them) after the
inclusion of envsetup.mk so this seems like a better place to
put them.

bug: 13647418

Change-Id: I3db39bdd761220c5b4966f651892fb592396f9a1
2014-04-08 17:40:40 +01:00
Doug Zongker 25d55f8733 select recovery assets based on target density
Recovery now has different res-*dpi directories for different display
densities.  Select one based on the highest density specified in
PRODUCT_AAPT_CONFIG.

Change-Id: Ieb0657a08e5df87f914fdda78a038cbbf82619e9
2014-04-04 14:41:05 -07:00
Narayan Kamath b4d757b1b2 am f6811abe: am 9fbd3afd: am 431b4bb3: Merge "Extend the CPU ABI specification mechanism."
* commit 'f6811abe12601c9753f329cb34da568f0072ca76':
  Extend the CPU ABI specification mechanism.
2014-03-31 12:35:14 +00:00
Narayan Kamath f6811abe12 am 9fbd3afd: am 431b4bb3: Merge "Extend the CPU ABI specification mechanism."
* commit '9fbd3afdecc2fee211c11a6aedb39422fa8dd773':
  Extend the CPU ABI specification mechanism.
2014-03-31 12:21:55 +00:00
Narayan Kamath 1a43b375b4 Extend the CPU ABI specification mechanism.
Add a (read only) system property that is a comma
separated list of ABIs supported by the device in order
of preference. For example, typical arm-v8 device might
define:

ro.cpu.abilist = arm64-v8a,armeabi-v7a,armeabi

For most purposes, a single flattened list like the above is
probably more useful than the parallel system of variables
TARGET_CPU_ABI{2} / TARGET_2ND_ARCH_CPU_ABI{2} that we use
in the build system.

Change-Id: If9102669ad9f5f8fd89a8bcc5bf88cca1acadc3c
2014-03-28 17:10:47 +00:00
Jeff Sharkey 26d22f7139 Import OEM build properties, if defined.
Certain products can define a list of system properties that should be
delegated to the OEM.  Since these properties may be ro.*, we give
them first shot at defining.

Also support blacklist of properties that should never be defined by
build.prop, used to delegate to runtime fingerprint generation.

Bug: 13367676
Change-Id: I3f00db732f485818205a7b76b31edbdc3a89aac0
2014-03-21 13:22:54 -07:00
Ying Wang ae5a1e1447 Try to catch more misuse of $(my-dir).
(cherry picked from commit 79e8319b2e)

Change-Id: I779af79c83de2ad1944269dd5bd31d65ff844064
2014-03-18 15:11:44 -07:00
Colin Cross 9bdcdff615 HACK: add 64-bit directory blacklist
Change-Id: I431e8b220db81d51930dc0b3d95995df120c179a
2014-03-13 11:26:26 -07:00
Ying Wang 009f48b00f am a6230641: am 26bcd640: Merge "Try to catch more misuse of ."
* commit 'a623064131f23412daa0ac4b333320e2e30d85f0':
  Try to catch more misuse of $(my-dir).
2014-03-11 18:17:42 +00:00
Ying Wang 9638890678 am 66a9b789: Merge "Include privileged apps with app zip file."
* commit '66a9b789703b7fac5f57fa318209dc8211f800f7':
  Include privileged apps with app zip file.
2014-03-11 18:16:01 +00:00
Doug Zongker 32b527d6cb test block system image patch at build time
After building a patch for the system image (for incremental block
OTAs), apply it to a local copy of the file and test that it succeeds.
This is an imperfect test as it's using the local client's
syspatch_host, which may differ from the syspatch library actually
used in the target build, but it's somewhat better than nothing.

Change-Id: Ic0001b0145881e2ebd4b5b36ce9b5bcebd76deb4
2014-03-04 10:03:02 -08:00
Doug Zongker 5fad2039bb handle don't care regions in the system image
The system partitions has regions that we shouldn't write and can't
depend on the contents of.  Adds a new script to generate a map of
these regions (using the sparse image as input), and include the map
in the package zip so it can be used when writing or patching the
system partition.

Also fixes a bug where the wrong SELinux file contexts are used when
generating incrementals.

Change-Id: Iaca5b967a3b7d1df843c7c21becc19b3f1633dad
2014-03-03 10:57:23 -08:00
Ying Wang 3bbfddd2ea Revert "Fix build: Revert "Try to catch more misuse of $(my-dir).""
This reverts commit 4f6e8342ac.
2014-03-01 15:32:04 -08:00
Ed Heyl 4f6e8342ac Fix build: Revert "Try to catch more misuse of $(my-dir)."
This reverts commit 79e8319b2e.

Change-Id: I7d4d352da802deea870fbe4f61f7a7023460a405
2014-03-01 14:25:08 -08:00
Ying Wang f6f141a873 am 9cf7af63: am 0c0e9b81: am a6230641: am 26bcd640: Merge "Try to catch more misuse of ."
* commit '9cf7af6317e6f792f0c044f786983481210022cc':
  Try to catch more misuse of $(my-dir).
2014-03-01 17:40:59 +00:00
Ying Wang 0c0e9b8153 am a6230641: am 26bcd640: Merge "Try to catch more misuse of ."
* commit 'a623064131f23412daa0ac4b333320e2e30d85f0':
  Try to catch more misuse of $(my-dir).
2014-03-01 17:34:29 +00:00
Ying Wang 79e8319b2e Try to catch more misuse of $(my-dir).
Change-Id: I0c07d7115c66b30ba1383dfaa133f0cc40a33ad7
2014-02-28 18:23:06 -08:00
Griff Hazen b1f4364868 am d3b40d52: am 6c23e7b8: am 433febb3: Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
* commit 'd3b40d5235d76461bf60f1eac73c132a06b1a30d':
  Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
2014-02-28 18:10:02 +00:00
Griff Hazen 6c23e7b8b4 am 433febb3: Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
* commit '433febb3c4593e777ef393371b6e99dcce9a7217':
  Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
2014-02-28 18:05:36 +00:00
Griff Hazen 433febb3c4 Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
Change-Id: Iecea3f3af628d89df65a44293a977b2bce35bf28
2014-02-28 08:45:59 -08:00
Ying Wang 70543d378e am f7d12336: am b3f2893f: am 66a9b789: Merge "Include privileged apps with app zip file."
* commit 'f7d12336f5aacf715636519363651ab9050abf8f':
  Include privileged apps with app zip file.
2014-02-27 01:36:03 +00:00
Ying Wang b3f2893f79 am 66a9b789: Merge "Include privileged apps with app zip file."
* commit '66a9b789703b7fac5f57fa318209dc8211f800f7':
  Include privileged apps with app zip file.
2014-02-27 01:30:08 +00:00
Robert Craig 59ec195a4d Include privileged apps with app zip file.
Include apps that appear under /system/priv-app
to also be included with the zip of all the apps.

Change-Id: If4687cf4c471877f11d78b68bad96f1842e49d87
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-02-26 12:00:14 -05:00
Doug Zongker 26e6619c37 add --block flag to ota_from_target_files
Add the --block flag to this script to control whether block-based OTA
packages are generated (defaults to off).  Make the full OTA package
produced by "make otapackage" continue to produce a block-based OTA.

Also fix a problem where block incremental OTAs didn't ever succeed,
and the --no_signing option never worked.

Change-Id: I610d0b4abed4b8b65fbe8ce0abaeec6cf52e14a1
2014-02-20 13:30:44 -08:00
Doug Zongker e322058542 img_from_target_files doesn't need releasetools extensions
This argument is superfluous; we don't need to compute its value or
pass it to the script.

Change-Id: I567a5c0b67060f8fcc0bf83e5bfa0272312b9124
2014-02-20 08:47:29 -08:00
Ying Wang 8918bf6f2f am f1339406: am 0c0a4ce8: Remove the default sdk.atree if custom one is set.
* commit 'f133940642722c45a37aad718423f3dac58233c0':
  Remove the default sdk.atree if custom one is set.
2014-02-18 23:00:02 +00:00
Ying Wang f133940642 am 0c0a4ce8: Remove the default sdk.atree if custom one is set.
* commit '0c0a4ce8f4c40b47d34774c7f36c80ae7f8082fc':
  Remove the default sdk.atree if custom one is set.
2014-02-18 22:54:08 +00:00
Ying Wang 0c0a4ce8f4 Remove the default sdk.atree if custom one is set.
Change-Id: I5d20b030db5ef29d7ff6eb64a0a1e11a4283e85d
2014-02-18 14:33:25 -08:00
Colin Cross 84a20ac12e am 2c32144b: resolved conflicts for merge of 7cd7bd65 to klp-modular-dev-plus-aosp
* commit '2c32144b328e0191fa32bf342dc7eb01d6174b6e':
  HACK: add 64-bit directory blacklist
  add support for module supported or unsupported target architectures
2014-02-12 23:00:21 +00:00
Ying Wang 53d2ca0713 am 4170e2be: am fd841351: Merge "Support custom sdk.atree files." into klp-modular-dev
* commit '4170e2be8e7493f2ad1abd33ba74638d9d421b3b':
  Support custom sdk.atree files.
2014-02-12 23:00:18 +00:00
Colin Cross 2c32144b32 resolved conflicts for merge of 7cd7bd65 to klp-modular-dev-plus-aosp
Change-Id: Ib4f062a59d442b29b9782fd8c0328fd551c3a32a
2014-02-12 13:09:29 -08:00
Colin Cross 02e31d240a HACK: add 64-bit directory blacklist
Change-Id: I431e8b220db81d51930dc0b3d95995df120c179a
2014-02-12 12:17:55 -08:00
Doug Zongker c9253822ea add recovery update code to system images
Currently, the "img" zip files generated by the build system lack the
script and data needed to rewrite the recovery partition, while the
"ota" zip files do (when installed).

In order to move towards block-based OTAs, we want the result of
flashing an image and the result of installing the corresponding OTA
package to be identical.

Generate the recovery-from-boot patch and install script as part of
the process of building the target-files.  This requires breaking the
code to generate that out of ota_from_target_files into its own tool
that we can run from the Makefile.  (ota_from_target_files can still
do this, so it continues to work with older target-files.)

Bug: 12893978
Change-Id: I80e62268840780b81216e548be89b47baf81b4ac
2014-02-04 13:50:35 -08:00
Ying Wang 780128a6f0 Support custom sdk.atree files.
Bug: 12683047
Change-Id: I79ca1eff81e947d03c50759d47426487e48435d0
2014-01-29 13:35:55 -08:00
Ying Wang c6c21d0622 Revert "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES.""
This reverts commit 06b3255118.
2014-01-21 20:25:46 -08:00
Ying Wang 036d2c1857 am 4a814d0a: am a0d68280: am f5db4548: am 62043de3: Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES.""
* commit '4a814d0a69470c96414a5e49b1ff90eb8935e2f9':
  Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
2014-01-22 04:06:56 +00:00
Ying Wang a0d68280ca am f5db4548: am 62043de3: Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES.""
* commit 'f5db454865c7b8cff22cc8faaeb5b983f059cb73':
  Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
2014-01-22 04:00:19 +00:00
Ying Wang f5db454865 am 62043de3: Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES.""
* commit '62043de346dff2d31c58bc8c002699fc74d1351c':
  Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
2014-01-21 19:57:41 -08:00
Ying Wang 06b3255118 Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
This reverts commit ca37190711.

Change-Id: I3a76f4cdf92ecbe3059bf5856cf341874e1393cf
2014-01-22 03:48:27 +00:00
Ying Wang e9924d7715 am 6e8e82ea: am 10515519: am 70cc8553: am 8d1f91fa: Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
* commit '6e8e82ea585f964981896cc510f007574ce6da2c':
  Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
2014-01-21 20:44:23 +00:00
Ying Wang 10515519ee am 70cc8553: am 8d1f91fa: Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
* commit '70cc85533dacfaa499f39c417cfd78e3ed922414':
  Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
2014-01-21 20:37:50 +00:00
Ying Wang 70cc85533d am 8d1f91fa: Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
* commit '8d1f91fa548c80357fffbdbdd5dcccc3c461c9ec':
  Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
2014-01-21 12:36:33 -08:00
Robert Craig ca37190711 Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
PRODUCT_COPY_FILES entries can include the src:dest:owner
syntax versus src:dest. This causes the filter to miss
certain cases. Instead use the word-colon function to
grab the dest regardless of syntax.

Change-Id: I1f4e57a236c1db148bada0cfe5bd1e87bb1194d6
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-01-17 09:13:50 -05:00
Ying Wang 734afe4e42 am 94ff79ea: am adc66128: am b6c57051: am f5ce4fa9: Merge "Install 64-bit libraries to /system/lib64."
* commit '94ff79eaf2d66be4c83656a41b4efa38ad34a970':
  Install 64-bit libraries to /system/lib64.
2014-01-14 20:15:45 +00:00
Ying Wang adc66128dc am b6c57051: am f5ce4fa9: Merge "Install 64-bit libraries to /system/lib64."
* commit 'b6c570510aa1d2747538fe734292873ed13f5b67':
  Install 64-bit libraries to /system/lib64.
2014-01-14 20:10:16 +00:00
Ying Wang b6c570510a am f5ce4fa9: Merge "Install 64-bit libraries to /system/lib64."
* commit 'f5ce4fa983f08d42bbc5d96af4f86bce5c190f0c':
  Install 64-bit libraries to /system/lib64.
2014-01-14 12:08:32 -08:00
Ying Wang c634974d37 Install 64-bit libraries to /system/lib64.
/system/lib always contains 32-bit libraries, and /system/lib64 (if
present) always contains 64-bit libraries.
Move things around a little bit, so TARGET_ARCH can be used to define
the build paths.

Bug: 11654773
Change-Id: I2edd91e162c7a20d7719d7bae15e5fa6c2a5b498
2014-01-13 16:20:31 -08:00
Ying Wang 1ff0836ce0 Emma support for host Java libraries.
To run emma on a host Java library, in the module definition use:
LOCAL_EMMA_INSTRUMENT := true
then run make with "EMMA_INSTRUMENT=true".

Bug: 12178695
Change-Id: Ie31582b94f5c45381f534912e810f88d21dde9b2
2013-12-30 09:17:06 -08:00
Michael Runge d537f93f20 am 4edeba20: am a8e32578: am 41e19a4c: am 6b55f007: am facd992e: Makefile used spaces instead of a tab
* commit '4edeba203d39698d1d7c8ddb1ef7906de630a24f':
  Makefile used spaces instead of a tab
2013-12-26 23:50:26 +00:00
Michael Runge 52ad1d7043 am 1a4520a5: am d961b7d0: am 5636d07a: am a80542db: am 4038aa8f: Enabled incrementals to patch + rename moved files
* commit '1a4520a5680a05a360986b260d15e170ed899da5':
  Enabled incrementals to patch + rename moved files
2013-12-26 23:50:25 +00:00
Michael Runge a8e325788c am 41e19a4c: am 6b55f007: am facd992e: Makefile used spaces instead of a tab
* commit '41e19a4cf0f10740aa3437b1c2365e49d4f15181':
  Makefile used spaces instead of a tab
2013-12-26 23:37:45 +00:00
Michael Runge d961b7d083 am 5636d07a: am a80542db: am 4038aa8f: Enabled incrementals to patch + rename moved files
* commit '5636d07a29108c77e6b8d38d96b0a1af3bae53ec':
  Enabled incrementals to patch + rename moved files
2013-12-26 23:37:44 +00:00
Michael Runge 41e19a4cf0 am 6b55f007: am facd992e: Makefile used spaces instead of a tab
* commit '6b55f00762c03b3625862b89f704090f58f970e7':
  Makefile used spaces instead of a tab
2013-12-26 15:33:32 -08:00