Commit Graph

5311 Commits

Author SHA1 Message Date
JP Abgrall 620e409127 am 775b1abb: core: Fixup bad ext4 mount options for recovery (pick common denominator)
* commit '775b1abb12a5d891ac66b51d28381692bde6ab03':
  core: Fixup bad ext4 mount options for recovery (pick common denominator)
2014-10-24 02:57:34 +00:00
JP Abgrall 775b1abb12 core: Fixup bad ext4 mount options for recovery (pick common denominator)
Some ext4 options were not suitable for all kernel versions.
The current option were checked against kernels 3.0 3.4 3.10.

Bug: 18092222
Change-Id: I30883706e5c8ac7a318f4b448d4becde50de808f
2014-10-23 16:27:03 -07:00
JP Abgrall 4f072e140b am 7bd80ca6: Merge "core: Let the build specify mount options for recovery" into lmp-dev
* commit '7bd80ca6ea2b0c5c39bdb05013fb3d0188fbcfa8':
  core: Let the build specify mount options for recovery
2014-10-23 21:57:11 +00:00
JP Abgrall 6ea5bd626c core: Let the build specify mount options for recovery
Currently recovery install/patch will mount /system++ with only default
options.
The default options are not very suitable for dealing with crashes.
We now use
 TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS
that can specify which mount options to use for a given fs-type.
  # <fstype>=<fstype_opts>[|<fstype_opts>]...
  # fstype_opts := <opt>[,<opt>]...
  #         opt := <name>[=<value>]
If only defaults are to be used, then the BoardConfig.mk can just have
an empty (must have ""):
 TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS := ""

The default is
 "ext4=match_batch_time=0,commit=1,data=journal,barrier=1,errors=panic,nodelalloc"

The release tools will pick them up with
  https://googleplex-android-review.git.corp.google.com/#/c/573628

Bug: 18092222
Change-Id: Iaa59099b0edf5af8835d1862fada089cff58882c
2014-10-23 17:54:01 +00:00
Ying Wang e3fe9cf213 am 03eceba1: Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
* commit '03eceba1ddfe6cf3ae6eb22bddc889930c097c1a':
  Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
2014-10-22 20:47:46 +00:00
Ying Wang 03eceba1dd Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
Change-Id: I9182ce1efe09609100d19c9fae2bc4fe7358dfc0
2014-10-21 18:34:30 -07:00
Adam Lesinski ea24f79479 am 318217a8: Enable building of gtest for Windows
* commit '318217a84a05880f5e10ba2086f87eb0320772c7':
  Enable building of gtest for Windows
2014-10-21 16:40:56 +00:00
Naseer Ahmed 3a2b9f0a49 core: OSX: Support 10.9 SDK as well
Change-Id: I764102df9b84ca19d217e35a209a9c80abeed6e7
2014-10-20 17:34:49 -07:00
Adam Lesinski 318217a84a Enable building of gtest for Windows
Windows does not have pthread support, and by defining the
GTEST_OS_WINDOWS flag, pthread support will not be built into
the windows version of gtest.

Change-Id: I0571fc52e77bb04175470d5750a7e2f46cdd5e86
2014-10-20 16:06:44 -07:00
Dianne Hackborn 4a6a7524b3 Move up to API 21, Lollipop MR1.
Change-Id: I81c3455d99673447ac0bc1b48d5ab1500b2bfd20
2014-10-17 10:05:33 -07:00
Stuart Scott 3c0190ff5b am f06c6eff: Add abi to generated XML
* commit 'f06c6eff656f6bf0ac06662ef21e29e446e1a43d':
  Add abi to generated XML
2014-10-15 00:22:35 +00:00
Stuart Scott f06c6eff65 Add abi to generated XML
bug:17881028
Change-Id: I6dd37e99c0f511d8c883cb8128ea743c2e21f6ad
2014-10-15 00:10:08 +00:00
Raphael Moll 5abf8bf257 am a4d1f6a7: SDK Addon multi-sys-img support.
* commit 'a4d1f6a7f0399b5e5e38b7c6f274f5fb11be48b9':
  SDK Addon multi-sys-img support.
2014-10-10 15:17:16 +00:00
Raphael Moll a4d1f6a7f0 SDK Addon multi-sys-img support.
Fix an issue where the add-on system images have 2 extra
inner folders. The sole root folder in the zip file should
be the ABI one.

Change-Id: Ie12b913438e2b1113d34222e467ff280daa23c7f
2014-10-10 00:50:39 +00:00
Ying Wang 36cff2a996 am edb9df24: Merge "Check to determine if we can run dex-preopt." into lmp-dev
* commit 'edb9df24d00091a5206ba36d7f32ed75d6c462b9':
  Check $(built_dex) to determine if we can run dex-preopt.
2014-10-09 16:57:16 +00:00
Narayan Kamath aec004e66c resolved conflicts for merge of 1a856098 to lmp-mr1-dev
Change-Id: Id2ef023078a251cc58450d457f5b20261e2851a3
2014-10-09 13:58:05 +01:00
Ying Wang 62fb8a1f55 Check $(built_dex) to determine if we can run dex-preopt.
Change-Id: Icfed37f50671ec041f2cfdcec9175cb094b572fc
2014-10-08 15:23:24 -07:00
Paul Lawrence a6a0435770 fs_mgr is now different on different build types
This is to enable compile time selection of disable-verity behavior

See https://googleplex-android-review.git.corp.google.com/#/c/563402/

Bug: 17691572
Change-Id: I6d77e39f070f2a753e09e5634cc3d9ebfceccada
2014-10-08 15:05:21 -07:00
Ying Wang e24e17a976 Export build thumbprint only if the product has specified at least one oem fingerprint property
Bug: 17888863
Change-Id: I4d12bc977dcb5e8e1858efb2a395466d8779de34
2014-10-07 18:59:47 -07:00
Andreas Gampe d8a89a8847 am c776f063: Merge "Build: Do not set interpreted mode for SDK build" into lmp-dev
* commit 'c776f06379929f1e1b9d1f4bb0749faf36e19670':
  Build: Do not set interpreted mode for SDK build
2014-10-03 23:52:41 +00:00
Andreas Gampe c776f06379 Merge "Build: Do not set interpreted mode for SDK build" into lmp-dev 2014-10-03 22:20:54 +00:00
Ying Wang 16d99e8d10 am a45c2e58: Merge "Add two useful character constants." into lmp-dev
* commit 'a45c2e5834ae6ff983e158c79f4fd65e09cdb766':
  Add two useful character constants.
2014-10-03 21:32:19 +00:00
Andreas Gampe 2abc44c2fe Build: Do not set interpreted mode for SDK build
In case of emulator images created for an sdk build (sdk, win_sdk,
sdk_addon), do not set dex2oat to compile apps interpret-only.

Bug: 17796919

Change-Id: I6961aa20fd3b6ea164a1f55321387e84c8983550
2014-10-03 13:46:24 -07:00
Ying Wang a45c2e5834 Merge "Add two useful character constants." into lmp-dev 2014-10-03 18:47:16 +00:00
Ying Wang 58a5db35a6 Add two useful character constants.
You need those constant variables when you want to insert newline or
backslash at the end of a macro.

Change-Id: I3fe96580d7a4ebc9d013afe6dd4ec8f40f49c724
2014-10-03 11:36:27 -07:00
Ying Wang 92126c6351 am 4991ae0b: Merge "Add split apks to the cts package." into lmp-dev
* commit '4991ae0b461688a5ecfe43707b9034e4e56809e4':
  Add split apks to the cts package.
2014-10-03 17:25:04 +00:00
Ying Wang 4991ae0b46 Merge "Add split apks to the cts package." into lmp-dev 2014-10-03 17:15:35 +00:00
Andreas Gampe 0f85ebab4b am 5e0dbe0c: Conditionally skip dex-preopting prebuilts.
* commit '5e0dbe0c3769031b4785ef54a89554cd5c75cba7':
  Conditionally skip dex-preopting prebuilts.
2014-10-02 21:24:58 +00:00
Andreas Gampe 5e0dbe0c37 Conditionally skip dex-preopting prebuilts.
To skip dex-preopting prebuilts (to save system image space),
set "DONT_DEXPREOPT_PREBUILTS := true".

Bug: 17772057

Change-Id: I13f10e2a9c251366f29606158f8c2fb54f8ee8b1
2014-10-02 10:14:59 -07:00
Stephen Hines 2094f855a8 am a503fb36: PIE executables created with mingw use "mainCRTStartup" as their entry point.
* commit 'a503fb362918363b28637b487eba83e9ad647ceb':
  PIE executables created with mingw use "mainCRTStartup" as their entry point.
2014-10-02 15:28:38 +00:00
Stephen Hines a503fb3629 PIE executables created with mingw use "mainCRTStartup" as their entry point.
Bug: 14416410

Our linker uses "start" as the primary entry point, so we need to adjust this
for mingw-based Windows compiles, or nothing will execute correctly.

Change-Id: I6e99f43e075ef9f00500099ce34ec4425c996454
2014-10-02 00:57:09 -07:00
Ying Wang 0f9cc262e3 am 72f0cf56: Merge "Convert comma in split arguments to underscore." into lmp-dev
* commit '72f0cf56b362b8a4b6cfefb3f47240aa9e2d5ce6':
  Convert comma in split arguments to underscore.
2014-10-02 01:44:52 +00:00
Ying Wang 72f0cf56b3 Merge "Convert comma in split arguments to underscore." into lmp-dev 2014-10-02 01:00:04 +00:00
Tim Murray 57e89e8c19 am 1de16912: Merge "Update prebuilt RS clcore location." into lmp-dev
* commit '1de169124df75618026b0264dbf782f336291f32':
  Update prebuilt RS clcore location.
2014-10-01 23:49:47 +00:00
Tim Murray 1de169124d Merge "Update prebuilt RS clcore location." into lmp-dev 2014-10-01 23:31:50 +00:00
Stephen Hines dcc376abc3 am 07a11d31: Merge "Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler." into lmp-dev
* commit '07a11d31f0baa355f9c3da60f965a56ff1d125e5':
  Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler.
2014-10-01 23:05:33 +00:00
Stephen Hines 907edebbb5 am 56f688bc: Merge "Switch TBLGEN-related executables to use "BUILD_" instead of "HOST_"." into lmp-dev
* commit '56f688bce5f3229f065a94446d049bc3a055b92b':
  Switch TBLGEN-related executables to use "BUILD_" instead of "HOST_".
2014-10-01 23:05:32 +00:00
Stephen Hines 07a11d31f0 Merge "Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler." into lmp-dev 2014-10-01 22:54:10 +00:00
Stephen Hines 56f688bce5 Merge "Switch TBLGEN-related executables to use "BUILD_" instead of "HOST_"." into lmp-dev 2014-10-01 22:53:38 +00:00
Tim Murray dc1d0abe37 Update prebuilt RS clcore location.
Change-Id: Iebf255d7cc093b74e08b1f1378d9b397fd9dd3b9
2014-10-01 15:52:11 -07:00
Dehao Chen 295a6d27f6 Add global option filtering for FDO builds.
Change-Id: I95e797f7f5945bb34061d17e49156ca8c8a19854
(cherry picked from commit c7ed00fc00)
2014-10-01 22:10:21 +00:00
Ying Wang 114a0fca3b Convert comma in split arguments to underscore.
aapt already does so.
Bug: 16947729

Change-Id: I813fb8cf41b3ec836e6e6d5f68af12dc385169f8
2014-10-01 12:01:04 -07:00
Ying Wang 89ec798796 Add split apks to the cts package.
With split apk support, we may have multilple installed files for a
module. Use ALL_MODULES.$(module).BUILT_INSTALLED to make sure get
every split apk included.

Bug: 16947729
Change-Id: I4e41c2586f1b25f4810b67cd1e948aba0cbcf97b
2014-10-01 11:46:30 -07:00
Ying Wang 6bef5124b7 am fc6d5b6a: Allow to add jar resource or manifest even without Java code.
* commit 'fc6d5b6a947fa80061778639290c0241b93635b4':
  Allow to add jar resource or manifest even without Java code.
2014-10-01 15:16:46 +00:00
Ying Wang 2a8015fad6 am c168b6e2: Merge "the recovery image also needs to be signed with " into lmp-dev
* commit 'c168b6e27aa48c1d5552ed9143eeb00d2c9860a5':
  the recovery image also needs to be signed with $(BOOT_SIGNER)
2014-10-01 15:16:46 +00:00
Chet Haase c533fa9831 am f388993a: Add docs for Palette and CardView
* commit 'f388993a8f5690cef3ea65f6982e343c53e96941':
  Add docs for Palette and CardView
2014-10-01 15:16:45 +00:00
Ying Wang fc6d5b6a94 Allow to add jar resource or manifest even without Java code.
Change-Id: I2d8fd93f004d9e0c29c71b887810b2624769789e
2014-09-30 17:32:58 -07:00
Ying Wang c168b6e27a Merge "the recovery image also needs to be signed with $(BOOT_SIGNER)" into lmp-dev 2014-09-30 16:41:08 +00:00
Stephen Hines dc64c7b460 Switch to hermetic GCC 4.8.3-based x86_64-w64-mingw32-4.8 compiler.
Bug: 14416410

prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32
is the location for the checked-in hermetic mingw Windows compiler. This
removes our reliance on host mingw when building with "make win_sdk".

Change-Id: I1f9bbb85912d9855be32f9cab4bdfd12d6d3246c
2014-09-30 02:38:41 -07:00
Stephen Hines b34b7aeb31 Switch TBLGEN-related executables to use "BUILD_" instead of "HOST_".
Bug: 14416410
Change-Id: Ife2d7329795f229adcddc5c57b20aa96c56387c0
2014-09-30 02:37:20 -07:00