Ying Wang
c47bea9dd9
Merge "Remove nonexisting module names."
2013-03-08 02:30:48 +00:00
Ying Wang
512b9628b0
Remove nonexisting module names.
...
Change-Id: I825de45f1b982e4aa391b11bf18ba90432272fa7
2013-03-07 18:29:56 -08:00
Christopher Ferris
161e0ef974
Merge "Adding TARGET_CPU_VARIANT to config file."
2013-03-08 02:18:08 +00:00
Christopher Ferris
6103fd7ac3
Adding TARGET_CPU_VARIANT to config file.
...
Adding this since all arm builds will require TARGET_CPU_VARIANT
to be set to a valid value in the near future.
Merge from internal master.
Change-Id: I2b73f9dbdd04cd8ac47035875c714bd0e75920e7
2013-03-07 18:12:50 -08:00
Ying Wang
671d90ea1d
Merge "Add module names to emulator PRODUCT_PACKAGES."
2013-03-08 01:15:00 +00:00
Ying Wang
18be7ab2c9
Merge "Stash TARGET_CPU_VARIANT and print it in dumpvar."
2013-03-06 21:55:33 +00:00
Ben Cheng
af21f7c3e7
Stash TARGET_CPU_VARIANT and print it in dumpvar.
...
Bug:7961327
Merged from internal master.
Change-Id: Ia78472ba53ae1221de4572119aa5c63246941eeb
2013-03-06 21:43:17 +00:00
Ying Wang
5085447f7f
Merge "Don't install all host modules by default."
2013-03-06 19:48:39 +00: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
962d06ef65
Add module names to emulator PRODUCT_PACKAGES.
...
Instead of using "LOCAL_MODULE_TAGS := debug" to install them.
Bug: 8276818
Change-Id: I7eba3c4e6c2f07ebe661522cb0e14afcc3ef7e92
2013-02-28 16:45:41 -08:00
Kenny Root
08d56b4a10
Merge "CTS: work around ClassLoader limitation"
2013-02-28 17:23:55 +00:00
Kenny Root
65307c065f
CTS: work around ClassLoader limitation
...
Trying to use reflection on classes loaded from a different ClassLoader
than the system one caused SecurityException since you can't load
certain packages.
Adding them to the boot classpath forces them to be in the same
ClassLoader.
Change-Id: Id518ab0a99da6defac525c0ad430a63f600ce85f
2013-02-27 16:56:04 -08:00
Ian Rogers
c148cca661
Merge "Specify -msse3 on host as on target."
2013-02-27 18:15:50 +00:00
Ian Rogers
35a6b4fb65
Specify -msse3 on host as on target.
...
Make the host and the target x86 build more uniform by using the same machine flags.
Its unlikely Android has ever been built on a machine without SSE3 support.
Bug: 8068608
Change-Id: I19635528b61bf2c6faf02c2e575b1d9bf8025d3a
2013-02-26 15:10:22 -08:00
Ying Wang
93cdbd0b81
Merge "Run zipalign after classes.dex is removed from the apk"
2013-02-26 00:51:10 +00:00
Ying Wang
7f7d4d93b8
Run zipalign after classes.dex is removed from the apk
...
If LOCAL_DEX_PREOPT is enabled.
Change-Id: Ie2a706fbb77bc31c9fdb01c8435819c5de97ea28
2013-02-25 16:02:42 -08:00
Jean-Baptiste Queru
0426da292c
Merge "Fixed error message for using OpenJDK."
2013-02-25 21:01:49 +00:00
Tim Roes
304f5194fd
Fixed error message for using OpenJDK.
...
Output a meaningful error message, when OpenJDK is detected
instead of giving the "wrong java version" output.
That output confused several users (from experiences in IRC)
since it gives you an output like "You are using java
version 1.6.0, right version would be Java SE 1.6".
Change-Id: I31ceeb03f1f98524b2b7de9b8be45231985fdb9e
Signed-off-by: Tim Roes <tim.roes88@googlemail.com>
2013-02-23 20:25:00 +01:00
Nick Kralevich
33b190f6c6
Merge "build: update fs_config calls for capabilities change."
2013-02-23 02:04:55 +00:00
Ying Wang
b303d5d7d4
Merge "[MIPS] Update build rules"
2013-02-22 18:03:15 +00:00
Ying Wang
4703b491d7
Merge "We shouldn't use temporary variable in the build recipe."
2013-02-22 18:02:04 +00:00
Ying Wang
514cc4d25e
We shouldn't use temporary variable in the build recipe.
...
Use $@ instead.
Change-Id: Ida0960a453b3701383a31f698c3163a297c4bce5
2013-02-22 10:01:33 -08:00
Nick Kralevich
fa798096fd
build: update fs_config calls for capabilities change.
...
Change-Id: Ic3c94f990c34a56d84f01c151f1b64f419e16419
2013-02-20 12:48:44 -08:00
Chris Dearman
6cc0c334fc
[MIPS] Update build rules
...
Add -D_FORTIFY_SOURCE=1 to the default cflags
Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
Use single dash version of -print-whatever
compile everything with relro / bind_now
Enable NX protections
Some other cleanups to reduce differences between ARM and MIPS config files
Change-Id: I30b4de449e6353b581ef7f9437a3bb9be53d5bbf
Signed-off-by: Chris Dearman <chris@mips.com>
2013-02-19 17:04:57 -08:00
Ying Wang
cdacb37806
Merge "[MIPS] Use mksh for /system/bin/sh"
2013-02-15 22:51:06 +00:00
Chris Dearman
1272b7872a
[MIPS] Use mksh for /system/bin/sh
...
Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: I01a6c1e2ac9de5b6d86c2aace041a0f7400f6b5e
2013-02-15 14:00:18 -08:00
Ying Wang
5e12e60b47
Merge "For the current MIPS compiler __builtin___clear_cache() generates synci instruction only with -msynci option So, add -msynci to all mips32r2 makefiles. Also add msynci to the list flags not recognized by clang."
2013-02-15 19:33:59 +00:00
Elliott Hughes
f6b670b702
Merge "Remove more always-true ARCH_ARM_HAVE_ flags."
2013-02-15 00:22:53 +00:00
Elliott Hughes
03d2aa4dd0
Remove more always-true ARCH_ARM_HAVE_ flags.
...
All the remaining flags appear to be actually used.
Change-Id: I0e3d84915487eda4f0e97809fc36624fef5f1848
2013-02-14 12:04:48 -08:00
Elliott Hughes
07a58f8fef
Merge "Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS."
2013-02-14 00:52:52 +00:00
Elliott Hughes
d0542498a0
Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS.
...
Because every ARM architecture we've ever supported has had both.
Change-Id: I607b56416e65073c5ac1b85fb17c092516e02573
2013-02-13 16:44:21 -08:00
Dirk Dougherty
54096df340
am 1f7c3cb3: am 061c758c: am 9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
...
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit '1f7c3cb3c2b475903c7616bf3f5b06530420cd94':
Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
2013-02-08 16:30:26 -08:00
Dirk Dougherty
1f7c3cb3c2
am 061c758c: am 9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
...
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '061c758cfa5409035854804efa1e0c4d32d2f007':
Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
2013-02-08 16:27:11 -08:00
Dirk Dougherty
061c758cfa
am 9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
...
# Via Dirk Dougherty
* commit '9fdf671d7f8fb96c1a8d3b41aaf4478e7274e45f':
Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
2013-02-08 16:22:04 -08:00
Dirk Dougherty
9fdf671d7f
Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
...
Change-Id: Ib75e776d0220a86a08ddd5d7e09edd069af05da1
2013-02-08 15:45:45 -08:00
The Android Open Source Project
ac95040906
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I242df2bfe9436a6b16e952da318b67b212e54516
2013-02-08 15:40:29 -08:00
The Android Automerger
fbef8b9578
JDQ39
2013-02-08 13:51:43 -08:00
The Android Automerger
b38f1fc9e1
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2013-02-08 13:50:51 -08:00
Scott Main
de0f30cdf1
am cd7ef9ce: am 8359d2c4: am b7f96375: docs: fix ::selection style to use Android blue for text highlighting
...
# Via Android Git Automerger (2) and Scott Main (1)
* commit 'cd7ef9ce90907f6894679bf293c7fca4759c3e72':
docs: fix ::selection style to use Android blue for text highlighting
2013-02-07 17:07:57 -08:00
Scott Main
cd7ef9ce90
am 8359d2c4: am b7f96375: docs: fix ::selection style to use Android blue for text highlighting
...
# Via Android Git Automerger (1) and Scott Main (1)
* commit '8359d2c4e98df00f66712c79efe3216059f5424d':
docs: fix ::selection style to use Android blue for text highlighting
2013-02-07 17:05:25 -08:00
Scott Main
8359d2c4e9
am b7f96375: docs: fix ::selection style to use Android blue for text highlighting
...
# Via Scott Main
* commit 'b7f963758f1a252a943b67b200b8e6141d94430c':
docs: fix ::selection style to use Android blue for text highlighting
2013-02-07 17:00:42 -08:00
Scott Main
b7f963758f
docs: fix ::selection style to use Android blue for text highlighting
...
Change-Id: I485be948326fc40c349c8170dd1be13962b4c003
2013-02-07 16:56:43 -08:00
Raghu Gandham
695fee31ad
For the current MIPS compiler __builtin___clear_cache() generates synci instruction only with -msynci option
...
So, add -msynci to all mips32r2 makefiles. Also add msynci to the list flags not recognized by clang.
Change-Id: I48fd6f2b0cbe80c3cd90f453ced97a2f154f7ad3
Signed-off-by: Rocky Zhang <yan@mips.com>
2013-02-07 16:07:01 -08:00
The Android Automerger
7faa1b886b
JDQ38
2013-02-07 14:23:55 -08:00
The Android Automerger
35e0666507
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2013-02-07 14:23:13 -08:00
The Android Open Source Project
15476e83b7
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: Icd2030678228e137e2616e2d64847abf4f5a2242
2013-02-06 09:11:09 -08:00
The Android Automerger
9770928ac8
JDQ36B
2013-02-05 16:48:44 -08:00
The Android Open Source Project
c43e8a9cdf
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I8c2fd056e6eea6c8d818aa44ced9421f84f64fe5
2013-02-05 13:43:19 -08:00
The Android Automerger
eed4696728
JDQ36
2013-02-05 12:24:50 -08:00
The Android Automerger
496fc81289
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2013-02-05 12:24:05 -08:00