Commit Graph

23 Commits

Author SHA1 Message Date
Christoffer Dall a60edd110f arm: Support qemu-android on generic arm targets
When building a generic arm 32-bit target, we also want to include
support for the ranchu board model for the updated Android emulator
based on recent upstream QEMU.

Since the emulator.mk file is included by both the generic and
generic_arm64 targets and already defines a PRODUCT_COPY_FILES and
PRODUCT_PACKAGES, move duplicate entries from
target/board/generic*/device.mk to target/product/emulator.mk.

Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Change-Id: I7922ec0c4097776a185dbb245301d760ff332386
2014-11-19 12:17:59 -08:00
Andreas Gampe ef14938abf am a815a009: Merge "Build: Increase system image for generic_arm64" into lmp-dev
* commit 'a815a009844586b01f525bc1e68335d6af078727':
  Build: Increase system image for generic_arm64
2014-10-03 16:59:35 +00:00
Andreas Gampe 65650a2ecb Build: Increase system image for generic_arm64
Prebuilts are now preopted. This requires a bump in system image
size. Technically a 13M bump would have been fine, but round up
to 50M for a little bit of future breathing space.

Bug: 17772057
Change-Id: Ib10dc24960c0b2e03ef28c55c3c199382802d4e1
2014-10-03 02:37:45 -07:00
David 'Digit' Turner 4d3f581d87 resolved conflicts for merge of 7a58de4e to lmp-dev-plus-aosp
Change-Id: I74491684909c34022c20932e1acd57887b1f0c15
2014-08-25 16:14:02 +02:00
David 'Digit' Turner d3e8cb7fda arm64: Fix aosp_arm64 system image.
This patch ensures that the system image produced for the 'aosp_arm64'
build products can actually run under emulation with the new qemu-android
binaries [1]

The main issue is that the virtual board is named 'ranchu' instead of
'goldfish' (because the virtual hardware is _very_ different), and thus
requires specific files for the boot to start properly

(in particular fstab.ranchu is required to mount the system, data and
cache partitions, otherwise init will fail badly because /system/bin/
and /data/ are missing important files).

IMPORTANT: This requires the files under device/generic/goldfish/ from:

    https://android-review.googlesource.com/#/c/105020/

[1] Binaries built from https://qemu-android.googlesource.com/qemu-android

BUG=17154406

Change-Id: Ic40360bf56e32aab708551c810000467d23793d4
2014-08-22 11:15:01 +02:00
Narayan Kamath 24b7840aa1 Add CPU_ABIs for the second generic_arm64 architecture.
This was accidentally removed by commit 8dc227f482.
Breaks builds for apps that use gnustl_static for 32 bit compiles
on an arm64 target.

bug: 16951392

Change-Id: I89480943284944fd95543cccbf40a8de22852197
2014-08-19 13:03:27 +01:00
Narayan Kamath 8dc227f482 Let aosp_arm64 / emulator assume NEON / cortex-a15.
It's only unbundled app builds that need to assume the
worst.

bug: 16951392
Change-Id: I5fda39c4132dafa58fefe02b767a4d2a208f3b12
2014-08-18 19:20:07 +01:00
Narayan Kamath 3930fbdd7c Make the 32-bit architecture for arm64 generic.
The idea is that we want to be able to build a single 32+64 APK
whose 32 bit code can run on 32 bit devices, where we can't assume
cortex-a15 or NEON.

Change-Id: Ia6bf400fa472924a94b08cef83e9e5dea09222ab
2014-08-08 18:26:44 +01:00
Ying Wang fa3aebf762 am b3529761: am 2d4a27ee: am d707b5aa: Merge "AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15"
* commit 'b3529761af24d19cd8cefa2c93f91920f0dfb28f':
  AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15
2014-06-11 21:38:20 +00:00
Serban Constantinescu 93694e63ee AArch64: Set TARGET_2ND_CPU_VARIANT for Arm64 to cortex-a15
A sensible default for the 32bit CPU_VARIANT of an ARM64 build is
cortex-a15. Please note that the AArch32 execution state of ARMv8
is a superset of ARMv7.

Change-Id: Id2b655172750e04609ae9ba22d621fe83cd69b1a
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
2014-06-04 16:19:24 +01:00
Elliott Hughes 5ef394b824 am d72b3164: am e972f9ff: am 0dbcff95: Merge "The generic_arm64 system image is full."
* commit 'd72b3164bdb731dd9871b221fe8db099a1f94514':
  The generic_arm64 system image is full.
2014-05-21 00:01:45 +00:00
Elliott Hughes 0499399231 The generic_arm64 system image is full.
Change-Id: I454c674033525f2f7847d2c91979dff8093c335b
2014-05-20 14:44:26 -07:00
Ji-Hwan Lee b32ea89a6a am 38c18c3b: am acfb2723: am c60783c9: Merge "Increase system image size to 650M for generic_arm64"
* commit '38c18c3b9adca416517fb332628253e2bb43fe23':
  Increase system image size to 650M for generic_arm64
2014-05-18 07:58:11 +00:00
Ji-Hwan Lee c89e1826ba Increase system image size to 650M for generic_arm64
Change-Id: I7969ec54dc4225bbe36651c4d9c6a09de1eb89f4
2014-05-18 02:42:14 +09:00
David 'Digit' Turner edc702c7d6 am 873782cc: am 9e3259f5: am fb67f05d: Merge changes I53b2ada9,I30794ea5
* commit '873782ccd44349c766f5d74e65b3b323618dd6ed':
  Disable emulator from platform builds.
  envsetup.sh: Use prebuilt emulator binaries if available.
2014-05-11 09:28:16 +00:00
David 'Digit' Turner f6e2694dd2 Disable emulator from platform builds.
Now that emulator prebuilts are available under prebuilts/android-emulator/,
disable building the emulator from source in all platform builds, except
if one defines BUILD_EMULATOR to 'true' in its environment.

NOTE: This patch should be applied after this one to avoid issues
      with the GPU emulation libraries:
            https://android-review.googlesource.com/93980

Change-Id: I53b2ada9ca0c2e159dccee7cdca7f55f6b0d1d42
2014-05-09 15:32:39 +02:00
Colin Cross 9871d2e270 am 0396b102: am 578f7ec4: am 45db0e05: Merge "aosp_arm64: increase userdata image size"
* commit '0396b10235ece43be797e48673ec05c4cf4c74d7':
  aosp_arm64: increase userdata image size
2014-04-02 17:44:54 +00:00
Colin Cross d46c7381c8 aosp_arm64: increase userdata image size
Increase userdata image size to allow make tests to builds with
extra tests to fit.

Change-Id: I2fea99d5a39816e78595215481b60ee51eb9182f
2014-04-02 09:17:29 -07:00
Lajos Molnar f40956fbbf stagefright: use media_codecs_google*.xml files
Bug: 13549114
Change-Id: I25d6344c78da152f394fa7b4855a2eb61008afc6
2014-03-19 17:39:39 -07:00
Tim Murray b5f333bbef Work in progress to enable build system support for Clang.
Change-Id: I278b48bcd976afcbde8d86261da9b9b9efc9002c
2014-03-14 00:39:03 -07:00
Colin Cross 15b1c8377d arm64: don't build emulator
There is no emulator kernel yet, so don't try to build the emulator.

Change-Id: I714f5717f439b4e48a973f4355f2c6684af79764
2014-02-20 14:39:09 -08:00
Colin Cross 930b5fbcb9 make 64-bit builds into multiarch builds
Also enable the 64-bit binder interface and make them only use ART.

Change-Id: I05de41ce348c14722c84a658f745659bde5ba423
2014-02-12 19:49:47 -08:00
Colin Cross 4f0eb7d50c build: rename aarch64 target to arm64
Rename aarch64 build targets to arm64.  The gcc toolchain is still
aarch64.

Change-Id: Ia92d8a50824e5329cf00fd6f4f92eae112b7f3a3
2014-01-23 22:39:38 -08:00