Commit Graph

2718 Commits

Author SHA1 Message Date
The Android Open Source Project
a2314e433e Merge jb-mr1-dev into aosp/master - do not merge
Change-Id: Icf16741de4c0d248e5ffe3ef3b31ce6ce51c4c9f
2012-11-27 08:06:10 -08:00
Ying Wang
be09a520c5 am 71958cca: Merge "Establish explicit dependency on selinux file_contexts."
* commit '71958cca5d5d5b569a2bb2ad2a4baf53045334e9':
  Establish explicit dependency on selinux file_contexts.
2012-11-21 12:22:23 -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
Jean-Baptiste Queru
136383549f Merge f7306051c1
Change-Id: I6a431153832ea069aba269d09ec73b784844ff44
2012-11-19 15:08:59 -08:00
Ed Heyl
f7306051c1 am 0ddeb0cc: am efcc8b1c: bump version to 4.2.1
* commit '0ddeb0ccc1d6dbbb21f9c6d7262d629c3cb8a792':
  bump version to 4.2.1
2012-11-19 14:29:37 -08:00
Ed Heyl
0ddeb0ccc1 am efcc8b1c: bump version to 4.2.1
* commit 'efcc8b1c79011a6d8ea13774da84c8892cb27e27':
  bump version to 4.2.1
2012-11-19 14:26:49 -08:00
Ed Heyl
efcc8b1c79 bump version to 4.2.1
Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
2012-11-19 14:20:48 -08:00
Jean-Baptiste Queru
9d9def1b18 resolved conflicts for merge of 4749c6e3 to jb-mr1-dev-plus-aosp - do not merge
Change-Id: I51fcb88d6b9f188a9c596031a2506eedc7150173
2012-11-19 10:57:48 -08:00
Chirayu Desai
6d492971dd build_id: change to OPENMASTER
Change-Id: I87863d8064515a0fabadacf4ca692c775fc4aae0
2012-11-18 14:09:34 +05:30
Ben Cheng
bf031a2586 am 17c679d0: Merge "[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*."
* commit '17c679d07380b0a4045045fd5d8e56111edf3fbd':
  [ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*.
2012-11-16 16:23:02 -08:00
Ben Cheng
8bc4c438bd [ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*.
In the future to upgrade the gcc version we just need to edit one
line in core/config.mk.

Change-Id: I01bb38c38f2388913bb7369aa4b2da480411dfbe
2012-11-16 13:29:13 -08:00
Guang Zhu
fdf573e4e0 am 06b57cef: am f0d4d8f3: DO NOT MERGE: change build id to JB MR1.1
* commit '06b57cefeaadd0e2f02a5c8a8679884366f4345e':
  DO NOT MERGE: change build id to JB MR1.1
2012-11-15 18:00:23 -08:00
Guang Zhu
06b57cefea am f0d4d8f3: DO NOT MERGE: change build id to JB MR1.1
* commit 'f0d4d8f32934df6dc859e2b668d436d67b388cd2':
  DO NOT MERGE: change build id to JB MR1.1
2012-11-15 17:57:58 -08:00
Guang Zhu
f0d4d8f329 DO NOT MERGE: change build id to JB MR1.1
Among other things, this helps monitoring of automated tests, to
properly show which branch the device is running on

Change-Id: I8bb8e3ec347849da44d29ce502b09a593d61ae0e
2012-11-15 17:47:53 -08:00
Ying Wang
ae56a570cb am e1f94189: am ce811261: Merge "Move check-api to definition.mk" into jb-mr1.1-dev
* commit 'e1f94189d95084a72d206d89ecb9d38de0512fc6':
  Move check-api to definition.mk
2012-11-15 15:23:44 -08:00
Ying Wang
e1f94189d9 am ce811261: Merge "Move check-api to definition.mk" into jb-mr1.1-dev
* commit 'ce811261bc8d56d43e59b1f9fb96ae53192de126':
  Move check-api to definition.mk
2012-11-15 15:20:58 -08:00
Ying Wang
c065da2307 Move check-api to definition.mk
1) Move check-api to definition.mk, so it can be used in other places.
2) Add additional dependency to the api-stub module to consolidate the
apicheck dependency. Previously you have to run 2 "make"s in a row and
only in the 2nd run apicheck is run, due to a gnu-make optimization.

Bug: 7540265
Change-Id: Ib24ed87d9330027a9f95ed7b16dd4002cc0e3198
2012-11-14 16:00:45 -08:00
Ying Wang
eb98e08893 am 865d851a: Merge "Remove the obsolete comments and change the misleading var name."
* commit '865d851a8012e13c35d573d98770b7187d32b7f7':
  Remove the obsolete comments and change the misleading var name.
2012-11-12 14:45:59 -08:00
Ying Wang
85e8cda340 Remove the obsolete comments and change the misleading var name.
Change-Id: Ib19099cbce0133f5c7df44fa0fd80215809a1ad8
2012-11-12 14:31:20 -08:00
Andrew Hsieh
abfb25226a resolved conflicts for merge of 8b3ce5a3 to stage-aosp-master
Change-Id: I588a055812ddc8f4531c9d02994beb366f9aab3e
2012-11-12 12:50:03 -08:00
Andrew Hsieh
e2e28f6d02 Use prebuilt gcc for MacOSX
1. Use prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1
   See https://android-review.googlesource.com/#/c/46223/
2. Rewrite logic dealing with mac_sdk_version to support all
   MacOSX SDK 10.6, 10.7 and 10.8.  Note that since
   ad2342375963c2468849c1f83a97158383db6511 emulator no longer
   depends on 10.6 to build.  Since the lowest SDK among intersection
   of the "available" and the "supported" SDKs is picked, add a
   new variable MAC_SDK_VERSION for developer really want to overwrite
   it.  MAC_SDK_VERSION still has to be one of the supported, though.
3. Improve mac_sdk_path detection to deal with case where Xcode
   *dmg is mounted only, not installed at /Applications.
4. Now we can retire BUILD_MAC_SDK_EXPERIMENTAL

Change-Id: I83e463556a857d527710f766de0e19e1b576151f
2012-11-12 10:44:52 -08:00
Andrew Hsieh
fc76f0eb17 am 2ea957a3: Merge "Revise checks for MacOSX to build emulator"
* commit '2ea957a373018ba6773c621065164256f0d84078':
  Revise checks for MacOSX to build emulator
2012-11-09 10:28:36 -08:00
Jean-Baptiste Queru
dde4fc127c Version number for AOSP master - do not merge
Change-Id: I67dab0de027ab458de326375a3f8077594f702cb
2012-11-09 07:46:14 -08:00
Andrew Hsieh
1dcca61869 Revise checks for MacOSX to build emulator
1. Check $(HOST_CC) instead of gcc for llvm-gcc.
2. Remvoe Mac SDK 10.4 check because emulator uses
   the same SDK version as the rest of framework

Change-Id: I4071fd45dc09a18c5341ad79e6a85e61df060fb4
2012-11-09 02:06:33 -08:00
Ying Wang
989d211b68 am f99f5e89: am d0b1977f: am 0138951e: Collapse multiple --extra-packages into one.
* commit 'f99f5e89a15cada28dc692a5a7ce3413bdd965b4':
  Collapse multiple --extra-packages into one.
2012-11-08 15:43:13 -08:00
Elliott Hughes
d125adca42 am ef9744f7: Merge "Remove manual WITH_JIT setting from build/."
* commit 'ef9744f7ee4fd2315f41c58ba48906d9d79363dd':
  Remove manual WITH_JIT setting from build/.
2012-11-07 18:31:35 -08:00
Ying Wang
f99f5e89a1 am d0b1977f: am 0138951e: Collapse multiple --extra-packages into one.
* commit 'd0b1977f7d12736a99a99893061948c622b5d8f3':
  Collapse multiple --extra-packages into one.
2012-11-07 16:33:08 -08:00
Ying Wang
0138951eaf Collapse multiple --extra-packages into one.
Change-Id: Icbdd56fa104c03e0a6cc58e441e60286a7f25bb2
2012-11-07 14:07:34 -08:00
Elliott Hughes
07a6db8733 Remove manual WITH_JIT setting from build/.
This is now done automatically by dalvik/, since
patch 272a54f8553e13b87bf819542ddc6701fc1232cc.

Change-Id: I57709538f20188417c014630442e897401d7ace0
2012-11-06 16:41:52 -08:00
Nick Sanders
278dbf3c6b am 9af26ddd: Merge "Disable factory build under PDK" into jb-mr1-aah-dev
* commit '9af26dddb39e5d87c8a455eb462eb3039e45ad69':
  Disable factory build under PDK
2012-11-02 18:48:59 -07:00
Nick Sanders
a1712eea02 Disable factory build under PDK
Phantasm PDK support doesn't work with the factory build.
It's not needed for eng support so we'll disable it.

Change-Id: I9b65cdbb20bbcff601600d6b0cac7cc98f6f614c
Signed-off-by: Nick Sanders <nsanders@google.com>
2012-11-02 12:55:56 -07:00
Joe Onorato
c9b12129b4 am 9a6a326c: Fix broken dependencies with the layers.txt files.
* commit '9a6a326ccd975af6aa27f5d4043dfd04d85f9c16':
  Fix broken dependencies with the layers.txt files.
2012-10-26 18:16:39 -07:00
Joe Onorato
9a6a326ccd Fix broken dependencies with the layers.txt files.
When a device java module was using the layers.txt files, and that device java module depenended on
a host java module, when building the host java module, the layer checker tried to run and would
fail, complaining about the host module.

The problem was that since the value wasn't set for the host module, it would be inherited from its
dependent module (a make "feature") and would cause the layer checker to run.  So this change makes
it explicitly set PRIVATE_JAVA_LAYERS_FILE for host java modules too.

Change-Id: Ifbc085295d0995a2da5d6d63d8cb379ef2631cc4
2012-10-26 16:38:14 -07:00
Ying Wang
84da5c55dd Filter out the overridden packages before doing required module expansion.
Bug: 6900954
Change-Id: Ib0f57dc4bfc341ec7166429a5bb71bfc5e28d271
2012-10-26 14:17:06 -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
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
Andrew Hsieh
267b07b2aa am 7176e801: Merge "Add TARGET_GCC_VERSION"
* commit '7176e8013bb2e563c3e3e56af4c04c50de3a7f37':
  Add TARGET_GCC_VERSION
2012-10-23 17:15:01 -07:00
Andrew Hsieh
06b63baedc Add TARGET_GCC_VERSION
Default to 4.6, but can overwritten to something else in
prebuilts/gcc/$os/$arch/$arch-linux-android*-$ver

Change-Id: I16f99d642b8ff8e831d392261a0c536041107051
2012-10-23 12:06:01 +08:00
Nick Kralevich
7c56556d18 am d883749e: Merge "x86: add --warn-shared-textrel"
* commit 'd883749e600a34b5eb4db542d24946b25aa5c9fb':
  x86: add --warn-shared-textrel
2012-10-22 11:04:24 -07:00
Joe Onorato
0cf8969beb am 2e5d317c: make packages respect LOCAL_ADDITIONAL_DEPENDENCIES
* commit '2e5d317c3ba36a7184b95cc77c87e116210ddc07':
  make packages respect LOCAL_ADDITIONAL_DEPENDENCIES
2012-10-20 19:00:08 -07:00
Joe Onorato
50462d67e9 am 8858d2a7: Add a tool to let you enforce layering between packages in a java module.
* commit '8858d2a731f432786b7548b5f63ac93be81eb986':
  Add a tool to let you enforce layering between packages in a java module.
2012-10-20 18:15:18 -07:00
Joe Onorato
2e5d317c3b make packages respect LOCAL_ADDITIONAL_DEPENDENCIES
Change-Id: I2595040f77f8ebb4d7c89140394a6060f167aee5
2012-10-20 18:13:57 -07:00
Joe Onorato
8858d2a731 Add a tool to let you enforce layering between packages in a java module.
And build system support for it too.

Change-Id: I4dd5ed0b9edab6e8884b0d00cfeeae5fa38d967a
2012-10-20 17:25:55 -07:00
Nick Kralevich
4f2f16da14 x86: add --warn-shared-textrel
Emit a warning when the static linker detects a shared library
has text relocations. Text relocations make it harder to
share pages across processes, and make it harder to use
certain memory protection features in, for example, SELinux.

This warning will turn into an error in a future change
(via --fatal-warnings)

Change-Id: I2d169c7ce3600d02e25591f3ec15aba363730298
References: http://www.akkadia.org/drepper/textrelocs.html
2012-10-19 13:36:49 -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
Guang Zhu
ea718cdb78 am 0f23979f: am 18daa175: Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev
* commit '0f23979f29db6b46978b78da4db90df862ffb925':
  DO NOT MERGE: better late than never: fix build id for JB MR1
2012-10-12 17:08:39 -07:00
Guang Zhu
0f23979f29 am 18daa175: Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev
* commit '18daa1750ba31b510d07d0f65e8e8007ed90b902':
  DO NOT MERGE: better late than never: fix build id for JB MR1
2012-10-12 17:06:21 -07:00