Commit graph

14833 commits

Author SHA1 Message Date
Narayan Kamath
948206c026 Merge "Fix tools path on Mac OS for java 7." 2013-12-06 17:11:08 +00:00
Narayan Kamath
fe57f66507 Merge "A few more Java7 related clean ups." 2013-12-06 17:10:53 +00:00
The Android Open Source Project
722581a598 Merge commit 'd54f8c2d1b4d88db84465fee93aa29103ca32078' into HEAD
Change-Id: I3cf53f083dee277a450dac36b011bc83180f6294
2013-12-05 12:59:39 -08:00
Ying Wang
18ee9e5e7d Merge "Push wpa_supplicant modules down to the leaf product config." 2013-12-05 19:14:20 +00:00
Ying Wang
3bd3693dd0 Merge "Delete board config for the unused "emulator" device." 2013-12-05 19:14:11 +00:00
Ying Wang
1caa938a22 Merge "Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices" 2013-12-05 19:14:01 +00:00
Ying Wang
17fc3d2ac1 Push wpa_supplicant modules down to the leaf product config.
Since 558477c0b2a5a7db679c1ad7551d43e6364d1df2 in
external/wpa_supplicant_8 we don't need those modules if
WPA_SUPPLICANT_VERSION is not set by the BoardConfig.mk.

Actually the generic devices don't need them.

Change-Id: Iff7c1fbf483bd16d5f898836c4e7401d56def80f

Conflicts:
	target/product/core_tiny.mk
2013-12-05 10:12:01 -08:00
Ying Wang
817d803c65 Delete board config for the unused "emulator" device.
Change-Id: I1e1d47fece4113be9f31f04775c5b310d28017e3
2013-12-05 10:08:10 -08:00
Ying Wang
ab6b4e0e22 Explictly set WPA_SUPPLICANT_VERSION := VER_0_8_X for the generic devices
Since 558477c0b2a5a7db679c1ad7551d43e6364d1df2 in
external/wpa_supplicant_8 we don't have WPA_SUPPLICANT_VERSION default
to VER_0_8_X.
This fixes the SDK build.

Change-Id: Ib7a8e10705dc6b987b60b1308405e89eaa2a47c9
2013-12-05 10:07:38 -08:00
Narayan Kamath
ab2e2e792e Fix tools path on Mac OS for java 7.
Change-Id: Ieb72b9e10771ee372bacf20258242cb006c29fef
2013-12-05 17:56:23 +00:00
Narayan Kamath
e2d27887be A few more Java7 related clean ups.
- Separate SDK checking from version checking and
  make messages clearer.
- Add explicit source & target versions for javac to
  make things clearer.
- Rename flag from EXPERIMENTAL_USE_JAVA7_OPENJDK to
  EXPERIMENTAL_USE_JAVA7.
- Allow Oracle JDK 1.7 to be used on Mac OS, since there's
  no official OpenJDK support for that platform.

Change-Id: I454d2c917ed78f03ec7559a99659fefe7e7d50f3
2013-12-05 13:23:06 +00:00
Ying Wang
e65c29697a Merge "Add utility function find-files-in-subdirs" 2013-12-05 02:40:32 +00:00
Ying Wang
7c8c7bd4b6 Add utility function find-files-in-subdirs
find-files-in-subdirs uses utility find to find given files in the given
subdirs. This function uses $(1), instead of LOCAL_PATH as the base.

Change-Id: Ib76631c97acd257d651a580cbad767606874f5d0
2013-12-04 16:56:38 -08:00
Ying Wang
6178f6f018 Merge "Run ar in Deterministic mode." 2013-12-02 22:19:27 +00:00
Ying Wang
b2f39181c6 Run ar in Deterministic mode.
Unfortunately no such flag was found for the host ar on Mac OS X.
https://code.google.com/p/android/issues/detail?id=60705

Change-Id: Ic2f75c871f0b5ae3cf20c1255458f7b921054d67
2013-12-02 14:15:23 -08:00
Ying Wang
7a77261988 Merge "core: support make 4.00" 2013-12-02 19:16:02 +00:00
Stephen Hines
65ca752aa1 Merge "Add FORCE_BUILD_RS_COMPAT option." 2013-11-27 23:18:23 +00:00
Stephen Hines
4e12f542be Add FORCE_BUILD_RS_COMPAT option.
This enables the .so libraries to be built for apps using the
RenderScript support library. Traditionally, we trim these .so
files from full platform builds.

Change-Id: I6f8e9b8d2b671338d3d5a5ac0bfcc60fd448688b
2013-11-27 14:54:15 -08:00
Elliott Hughes
66153e38b0 Merge "Switch x86 over to uapi-only." 2013-11-26 18:51:47 +00:00
Narayan Kamath
7519d73780 Merge "Add experimental flag to support OpenJDK builds." 2013-11-26 18:01:17 +00:00
Ying Wang
0b25d9fa70 Merge "Change build id to OPENMASTER" 2013-11-26 17:51:12 +00:00
Ying Wang
7738e721fa Merge "Version number change for AOSP master" 2013-11-26 17:50:35 +00:00
Ying Wang
ad69099131 Add experimental flag to support OpenJDK builds.
bug: 8992787

(cherry picked from commit d1dbe7f5a2)

Change-Id: Ie977d4f26ae8d3eee9d7b9cf2c0c270bee5b54b3
2013-11-26 10:30:14 +00:00
Chirayu Desai
e131cf8486 Version number change for AOSP master
Change-Id: I49ef02f99c6428bc538ba3839a0314d977f65e07
2013-11-26 08:29:29 +05:30
Elliott Hughes
462880407e Merge "Switch MIPS over to uapi-only." 2013-11-26 00:51:54 +00:00
Elliott Hughes
e5df095b76 Switch x86 over to uapi-only.
Bug: 11559337
Change-Id: I95aa40ec2094acdaef1d4b4d9f0dd6278cf558d1
2013-11-25 16:38:47 -08:00
Elliott Hughes
b88bdebcb9 Switch MIPS over to uapi-only.
Bug: 11559337
Change-Id: I04b93d0d681ddf75573cdeca2d25ffa44862a35f
2013-11-25 14:01:10 -08:00
Elliott Hughes
a5b55c27c0 Merge "Add a "reverse AUX hack" for ARM." 2013-11-25 21:42:12 +00:00
Dave Allison
014a3c0d62 Add support for instruction set features
This adds the --instruction-set-features= arguments to the dex2oat
commands for the system images.  The feature set is determined at
build time

(cherry picked from commit 4145a2a20a0f275fe4c77e39d507cd5f8eb7a73b)

(cherry picked from commit 5174bb0529)

Change-Id: I45af3b59752a48897bff2dd468b74f3ea73000be
2013-11-25 12:27:24 -08:00
Elliott Hughes
9696acae02 Add a "reverse AUX hack" for ARM.
MIPS and x86 are almost completely switched over to uapi-only. ARM is still
currently old-only. A cleanup of the uapi headers over the weekend means
that the uapi-only <linux/kexec.h> is now in the right place, which will break
the ARM build unless the ARM build also looks in the uapi headers if it can't
find an old header.

Change-Id: Ie7a53ef2122b43cdef64b71d7b36a8381992a461
2013-11-25 12:06:25 -08:00
Ying Wang
3821622fc7 Merge "Rework the generation of host java libraries." 2013-11-25 19:01:43 +00:00
Narayan Kamath
40dae1fefa Rework the generation of host java libraries.
We currently have two types of host libraries, those
meant for the host VM (Sun, OpenJDK etc.) and those meant
for a host dalvik build. The former need to be compiled
against the host standard libraries and the latter need
to be compiled against libcore. This change introduces
two new build rules to complement the existing the existing
host rules.

BUILD_HOST_DALVIK_JAVA_LIBRARY : Build a java library for
a host build of dalvik. Bootclasspath will be set to a host
build of libcore.
BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY : Build a static java
library for a host build of dalvik. Bootclasspath will be set
to a host build of libcore.

This change also removes support for the LOCAL_BUILD_HOST_DEX
flag, which is now unnecessary.

bug: 8992787

(cherry picked from commit 0dd273a3f6)

Change-Id: I3569fff8eaa4d26d55fcc317bd98471f55d74c14
2013-11-25 10:17:53 +00:00
Chirayu Desai
ab5e1624f0 Change build id to OPENMASTER
Change-Id: I2ca9b8de815c9c9e7e9d4c5a616e4ae270992761
2013-11-25 15:37:46 +05:30
The Android Open Source Project
b9041a45b1 Merge commit 'c73341006286c391ae4d268a77f5e008045d5308' into HEAD
Change-Id: I4bf7d32d65e19dfa1f0533fdd3b2295c50b13005
2013-11-22 11:06:11 -08:00
Elliott Hughes
a59b8545cf am e296f2c3: Merge "Switch mips to the uapi kernel headers."
* commit 'e296f2c38279836e23e15fad0064a88dbfe058e7':
  Switch mips to the uapi kernel headers.
2013-11-20 13:30:29 -08:00
Elliott Hughes
e296f2c382 Merge "Switch mips to the uapi kernel headers." 2013-11-20 21:26:26 +00:00
Elliott Hughes
66ef53d83b Switch mips to the uapi kernel headers.
Bug: 11559337
Change-Id: Ic37b284398c049011f98651de84cef760566ebde
2013-11-20 12:55:09 -08:00
Elliott Hughes
bd36506ee4 am e57c8446: Merge "Switch x86 to uapi headers."
* commit 'e57c8446f0fa8e02b27e0b77aee7a2b62784cc54':
  Switch x86 to uapi headers.
2013-11-19 17:16:24 -08:00
Elliott Hughes
e57c8446f0 Merge "Switch x86 to uapi headers." 2013-11-20 01:12:23 +00:00
Elliott Hughes
2d9dc89962 Switch x86 to uapi headers.
We still need the 'aux' hack, but this is a good step forward.

Bug: 11559337
Change-Id: Ib3d79317293e1cd3d2620c38e6b472a5994ee554
2013-11-19 16:55:00 -08:00
Ying Wang
1b4252cd03 am 0f78b47b: Merge "Switch AOSP X86/MIPS compiler to gcc4.8"
* commit '0f78b47bb304bc6f9597dd0788c60eb4f83d9ea0':
  Switch AOSP X86/MIPS compiler to gcc4.8
2013-11-15 14:56:50 -08:00
Ying Wang
0f78b47bb3 Merge "Switch AOSP X86/MIPS compiler to gcc4.8" 2013-11-15 22:51:10 +00:00
Andrew Hsieh
8baaca5f97 Switch AOSP X86/MIPS compiler to gcc4.8
Change-Id: Ifeee2c7d696c8a8e96e52c6ca51434260bdae5f8
2013-11-15 10:25:58 +08:00
Dianne Hackborn
d54f8c2d1b am 1611712d: am 221fcf31: Merge "Just a little .1 makes all the difference in the world." into klp-dev
* commit '1611712dac98d13e24ac6056405713d4994d25a5':
  Just a little .1 makes all the difference in the world.
2013-11-14 15:44:33 -08:00
Dianne Hackborn
1611712dac am 221fcf31: Merge "Just a little .1 makes all the difference in the world." into klp-dev
* commit '221fcf3183978d7ec6d482e09602312485f6652f':
  Just a little .1 makes all the difference in the world.
2013-11-14 14:57:39 -08:00
Dianne Hackborn
221fcf3183 Merge "Just a little .1 makes all the difference in the world." into klp-dev 2013-11-14 22:53:55 +00:00
Ben Cheng
9a1f26e425 am 2e6753a0: am de9b1835: Merge "Switch AOSP ARM build to use GCC 4.8."
* commit '2e6753a058a766d7c0607437224470c14574a94e':
  Switch AOSP ARM build to use GCC 4.8.
2013-11-14 14:14:22 -08:00
Ben Cheng
2e6753a058 am de9b1835: Merge "Switch AOSP ARM build to use GCC 4.8."
* commit 'de9b1835b3f3a025c2ab57154d0b5840469868f6':
  Switch AOSP ARM build to use GCC 4.8.
2013-11-14 14:09:57 -08:00
Ben Cheng
de9b1835b3 Merge "Switch AOSP ARM build to use GCC 4.8." 2013-11-14 22:06:34 +00:00
Ben Cheng
818d7d04f5 Switch AOSP ARM build to use GCC 4.8.
Change-Id: I65051773153ad5bc2c093cd1313acd212eb427b1
2013-11-14 14:05:29 -08:00