Commit graph

169 commits

Author SHA1 Message Date
Stephen Smalley
737f9a167a Add policy for x86 emulator. 2013-12-20 14:33:55 -05: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
The Android Open Source Project
b9041a45b1 Merge commit 'c73341006286c391ae4d268a77f5e008045d5308' into HEAD
Change-Id: I4bf7d32d65e19dfa1f0533fdd3b2295c50b13005
2013-11-22 11:06:11 -08:00
Stephen Smalley
1d5352eaa3 Move goldfish-specific policy rules to their own directory.
Change-Id: I1bdd80f641db05fef4714654515c1e1fbb259794
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-11-06 10:24:14 -05:00
Jamie Gennis
1a63bb6619 am e652af1e: Merge "BoardConfig: Add and document vsync phase offset setting" into klp-dev
* commit 'e652af1e808b2b15e23bc472f9be6592735a0a8e':
  BoardConfig: Add and document vsync phase offset setting
2013-10-08 15:13:47 -07:00
Jamie Gennis
782f2ad375 BoardConfig: Add and document vsync phase offset setting
Bug: 10624956
Change-Id: I82def5730f9d09396809d4b8cd2ea44829b21f22
2013-10-07 18:01:17 -07:00
Ben Cheng
a698dab816 am 0b42554f: am 12eeb000: Merge "Add generic aarch64 board config and build rules."
* commit '0b42554fd8c7a43ca45504e4586f1eef578308de':
  Add generic aarch64 board config and build rules.
2013-10-07 14:42:10 -07:00
Ben Cheng
db4fc200c4 Add generic aarch64 board config and build rules.
Change-Id: I8b4a377596705dfa0a3bd234162d183ec2ae9530
2013-10-07 13:58:27 -07:00
Ying Wang
6a6db9432f am ab7b53b8: am 5d92a933: Merge "x86_64: Adding new target"
* commit 'ab7b53b8e09e3d346384a5257e8f7a440a53dfc0':
  x86_64: Adding new target
2013-10-02 15:06:02 -07:00
Pavel Chupin
fd82a49e04 x86_64: Adding new target
Add x86_64 Android builds. Compiler is expected to be able to understand
-m64 code generation option.

Change-Id: I99e7337c5a5766afc5e528a481bd21631ff44dd5
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-10-02 20:58:54 +04:00
Ying Wang
ad7fd29b31 Don't bother going through the source tree
Don't bother going through the source tree in more circumstances:
all cleaning goals, helping goals, no-deps goals.

Bug: 10244578
Change-Id: Id53a249085c62838e4193962a85e0ac34f46954f
2013-08-09 10:08:30 -07:00
Ying Wang
0650d1503d Add PRODUCT_BOOT_JARS to derive BOOTCLASSPATH
- BOOTCLASSPATH now is product-configurable;
- No need to maintain the duplicate values in core/dex_preopt.mk.
- clean up some legacy ALL_PREBUILTs.
Bug: 9990214

Change-Id: Ie3953e66d282e335bb7782b0ebd56102c35ec10e
2013-07-24 15:15:55 -07:00
Nick Kralevich
a682f6db7b am 4e132ca5: Merge "emulator: increase system partition to 550M"
* commit '4e132ca5e5c5048d7a95563eddd9f5ef11346678':
  emulator: increase system partition to 550M
2013-07-12 20:44:41 -07:00
Nick Kralevich
865ffd4efe emulator: increase system partition to 550M
Yes, 400M isn't enough. I can't believe it either.

Change-Id: I7d3857f04bfda472af6a281017204672bb9c9940
2013-07-12 20:28:59 -07:00
Nick Kralevich
e9ee5e11b4 am 5411ef9c: Merge "emulator: increase system partition size to 400M"
* commit '5411ef9cc4a4bf5c1950df89f2b2032edcf83dc8':
  emulator: increase system partition size to 400M
2013-07-12 15:15:33 -07:00
Nick Kralevich
de2709baac emulator: increase system partition size to 400M
300M is too small.

Change-Id: Icbe4e76d6e5c8a50cc6e6d74e324335bc66b8466
2013-07-12 13:44:48 -07:00
Ying Wang
6685bd01a9 am 2476ec99: Merge "use ext4 instead of yaffs for the emulator"
* commit '2476ec994d449d31c89571723b4b17826639c1bf':
  use ext4 instead of yaffs for the emulator
2013-07-12 11:11:56 -07:00
Nick Kralevich
3c9fae2840 use ext4 instead of yaffs for the emulator
Bug: https://code.google.com/p/android/issues/detail?id=38561
Change-Id: I7c605457b485d169654263caf55eb7d5a9a60c2e
2013-07-11 22:39:38 -07:00
Jeff Sharkey
90baef427e DO NOT MERGE. Fix build by removing old file.
Change-Id: I2fb4d27acfabb9283d54958f0438a6db74641dd2
2013-04-11 17:09:56 -07:00
keunyoung
fe30957867 reflect the migration of emulator hal to device/generic/goldfish
- no longer need to check the presence as device/generic/goldfish is in PDK

Change-Id: I551dd283fb6511d8ebd45a8519f797f8ba2f1a05
2013-03-11 09:41:17 -07: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
Christopher Ferris
6d7c03bfc3 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.

Bug: 8005082
Change-Id: I5b945a36c10e0095bccbe453f7652da08ebc6162
2013-02-22 17:24:25 -08:00
Ying Wang
0c480c0513 am aa80cac8: am cdacb378: Merge "[MIPS] Use mksh for /system/bin/sh"
* commit 'aa80cac8d31ad76111de6f8e718b3e7c27a7d31a':
  [MIPS] Use mksh for /system/bin/sh
2013-02-15 15:54:32 -08: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
Elliott Hughes
b2bbff7cba am ea852f6e: am f6b670b7: Merge "Remove more always-true ARCH_ARM_HAVE_ flags."
# Via Android Git Automerger (1) and others
* commit 'ea852f6ed3e9f251eaef4f041fbc0b09229ac924':
  Remove more always-true ARCH_ARM_HAVE_ flags.
2013-02-14 17:31:40 -08: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
Ying Wang
f05c4f7524 Resurrect generic_armv5
But only for unbundled build.
Add it to tapas arch options.

Bug: 8108463
Change-Id: I53cd63c6ab2113fee3992650b561658231ea9921
2013-01-31 11:43:14 -08:00
Jean-Baptiste Queru
2387857dad am 968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"
* commit '968f20a4c2ffca9a0cf8870bd96c77e65ca61243':
  MIPS support to *.mk files and envsetup.sh
2012-08-10 09:23:42 -07:00
Jean-Baptiste Queru
dd14acc3f6 am e443a9e9: Merge "Modify full_mips-eng build in line with the full-eng build"
* commit 'e443a9e92f323bff5bb304e1baf8b00ed18888be':
  Modify full_mips-eng build in line with the full-eng build
2012-08-10 09:23:38 -07:00
Raghu Gandham
8da4310646 MIPS support to *.mk files and envsetup.sh
Change-Id: Iba4d046e3202524b29cfe32980927f8cc0aa8496
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
2012-08-10 09:15:38 -07:00
Chris Dearman
1603e3a987 Modify full_mips-eng build in line with the full-eng build
Change-Id: Iebbad0c2a4f8f01b2ff8a08ea77965291a842636

Signed-off-by: Raghu Gandham <raghu@mips.com>
2012-08-01 11:04:09 -07:00
Guang Zhu
96d9fa29cd resolved conflicts for merge of ef1335ed to jb-dev-plus-aosp
Change-Id: I4da6c32635e67730ac595a2a04165f12c37c1c15
2012-07-11 19:36:17 -07:00
Guang Zhu
ef1335eda4 use default shell (mksh) in emulator
remove the override to use ash as shell so that mksh is the
default in 'generic' product type

Change-Id: I91d76d0fc522baf5d47096ab19ea264c9b1268e6
2012-07-11 18:35:08 -07:00
Jean-Baptiste Queru
ddb706785b am 5b7633be: am 06e515dd: Merge "This patch addresses the following issues:"
* commit '5b7633be4e107888db7b6fc3d50be6aa8eb7f95c':
  This patch addresses the following issues:
2012-06-12 08:05:22 -07:00
Keun young Park
d3da15a5ee am 6aae80a8: Merge "add mini.mk for common configurations for mini products" into jb-dev
* commit '6aae80a8d500084466c7e6d90769dda9a5b20507':
  add mini.mk for common configurations for mini products
2012-06-06 15:51:24 -07:00
Keun young Park
fd9f8bcfdb add mini.mk for common configurations for mini products
- it is used for generic pdk release

Bug: 6540216

Change-Id: I7dd21724a9484e48c66e4430cd003ffb448f075b
2012-06-06 14:15:57 -07:00
Raghu Gandham
f70dec9281 This patch addresses the following issues:
1. Fix a typo.
2. Include libffi in the MIPS list of Product Packages.
3. Default to JSC for MIPS until the MIPS support in v8 lands in aosp.
2012-06-05 15:33:37 -07:00
Keun young Park
53ba6b22f9 am 15d15136: Merge "change location of apns-conf.xml and vold.conf" into jb-dev
* commit '15d151367482b6ed47cecf1a578b365b7c6ccab3':
  change location of apns-conf.xml and vold.conf
2012-05-30 20:34:00 -07:00
Keun young Park
e581d866fb change location of apns-conf.xml and vold.conf
- from development/data to device/generic/goldfish/data

Change-Id: Iab7ad32b31b64f854412dd3cf23fd244a5306ed9
2012-05-30 16:32:30 -07:00
Jean-Baptiste Queru
fe5d7c788b am a2bfde63: am fed2587c: Merge "dalvik heapsize: Remove obsolete flag, set porperty"
* commit 'a2bfde63b767378979145cb8be55d9a305e2b4f5':
  dalvik heapsize: Remove obsolete flag, set porperty
2012-05-25 07:19:55 -07:00
Bruce Beare
5b21303927 dalvik heapsize: Remove obsolete flag, set porperty
Change-Id: I51360867171aaebce071b3391678ff6e7f191dc5
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2012-05-24 11:38:18 -07:00
Andrew Hsieh
b968c85edf Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86
Change TARGET_ARCH_VARIANT from x86-atom to x86, for the reason
that atom-specific instruciton like "movbe" isn't "generic" to
x86 Android devices and x86 host running emulator-x86, which may
crash non-atom host in VT because "movbe" isn't supported natively.

Also revert previous fix in TARGET_linux-x86.mk which conservatively
disable "movbe" across the board

Change-Id: Ief93a3585566ffae558fcdc29741e6213a048d7d
2012-05-21 14:27:59 +08:00
Jean-Baptiste Queru
44fd5580b5 am 7eb749d1: am 2d7274de: Merge "MIPS generic target support"
* commit '7eb749d134fd52e23be7218bf2ea7dfa1b1180b3':
  MIPS generic target support
2012-05-11 21:53:54 -07:00
Jean-Baptiste Queru
2d7274de30 Merge "MIPS generic target support" 2012-05-11 14:46:38 -07:00
Jean-Baptiste Queru
8ff07372c1 am 0e2bc24e: am cd99ece7: Merge "x86: customize the malloced address to be 16-byte aligned"
* commit '0e2bc24ef002ec612e94a64da297a7698acde749':
  x86: customize the malloced address to be 16-byte aligned
2012-05-11 14:12:10 -07:00
Raghu Gandham
b53cc7a82b MIPS generic target support
Change-Id: I76506eba9d11867e53069c97038996bddd7dd5a2
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
Signed-off-by: Duane Sand <duanes@mips.com>
Signed-off-by: Bhanu Chetlapalli <bhanu@mips.com>
2012-05-08 11:53:47 -07:00
Jack Ren
6f28d9750c x86: customize the malloced address to be 16-byte aligned
That can gain better memory performance than 8-byte alignment

Change-Id: Ibcc5bf7b96ed10166038357dd0c86c9171768f3e
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2012-05-08 13:38:25 +08:00
Jean-Baptiste Queru
0cfde4016d Merge 8664008c to master
Change-Id: Ia6aa11892665b8aa42e5fbc69146db251d9a8636
2012-04-24 14:47:45 -07:00