Commit Graph

20734 Commits

Author SHA1 Message Date
Dan Albert fc0d1e6f58 am 0616000d: Merge "Make cgrep check .hpp files as well."
* commit '0616000d09905ac423dae0ffccdb0ef3fe24f36d':
  Make cgrep check .hpp files as well.
2014-11-22 20:57:19 +00:00
Dan Albert 0616000d09 Merge "Make cgrep check .hpp files as well." 2014-11-22 20:48:45 +00:00
Dan Albert 019611958f Make cgrep check .hpp files as well.
Change-Id: Ie8e9ce7270233ac01d7bc80bda5adc28afa158ed
2014-11-22 10:16:01 -08:00
Elliott Hughes 08989eccdd am 28a9c770: Merge "Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN."
* commit '28a9c77026bac5e93a03f1f6c67192fc0a6e6c0d':
  Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN.
2014-11-22 08:17:54 +00:00
Elliott Hughes 28a9c77026 Merge "Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN." 2014-11-22 08:06:11 +00:00
Elliott Hughes f632832929 am 9d3ca15f: Merge "Kill LOCAL_SOCKET_NAMESPACE."
* commit '9d3ca15f1c8789390b8baaa2df28fd11b14a0a9d':
  Kill LOCAL_SOCKET_NAMESPACE.
2014-11-22 08:01:19 +00:00
Elliott Hughes 619b692b9a Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN.
Change-Id: Ie596af7460ec33d70d7327e629b38d641ef48ba2
2014-11-21 23:55:26 -08:00
Elliott Hughes 9d3ca15f1c Merge "Kill LOCAL_SOCKET_NAMESPACE." 2014-11-22 07:52:42 +00:00
Elliott Hughes 80c63ddfd7 Kill LOCAL_SOCKET_NAMESPACE.
Change-Id: I40c63b8e7ae1174ac902b545555ddab65b3fef38
2014-11-21 22:54:28 -08:00
Dirk Dougherty d955a0cb88 am d4a50497: am a38ca021: am 8c657dc2: am b87e3000: Support langs.
* commit 'd4a50497bdbf23e3458757b90f1f40b727cd3441':
  Support langs.
2014-11-21 10:46:29 +00:00
Dirk Dougherty d4a50497bd am a38ca021: am 8c657dc2: am b87e3000: Support langs.
* commit 'a38ca02145c0478e5d45b43c775fdabc36a0a888':
  Support langs.
2014-11-21 10:42:09 +00:00
Dirk Dougherty a38ca02145 am 8c657dc2: am b87e3000: Support langs.
* commit '8c657dc214ef430d57c6e0483e25eb6faf7a5619':
  Support langs.
2014-11-21 10:37:02 +00:00
Ying Wang 9f790a0a15 am 51840e4b: Support journal size board config variables. automerge: e91b83d
automerge: 1a5f137

* commit '1a5f13701a4070d63b46d48aaae85428b924e561':
  Support journal size board config variables.
2014-11-21 02:41:08 +00:00
Dan Albert 0951017a9e am 9cef6823: Merge "Revert "Fix the libgcc/libatomic link order.""
* commit '9cef6823069d181afa2befa8db771761f8db0c27':
  Revert "Fix the libgcc/libatomic link order."
2014-11-20 23:43:34 +00:00
Dan Albert 9cef682306 Merge "Revert "Fix the libgcc/libatomic link order."" 2014-11-20 23:27:24 +00:00
Dan Albert e440c3c07b Revert "Fix the libgcc/libatomic link order."
This caused a lot of failures in the libc++ tests, since linking
libgcc.a before libc++.so means that the wrong unwinder will be used.

This patch is still correct, but I will revert for now while I find a
good way to apply it without breaking unwinding.

This reverts commit 741b36e922.

Change-Id: I57e0b89534adf5c1677dbf2f64ac750e74bd5fbf
2014-11-20 15:10:00 -08:00
Elliott Hughes 7e601c28c7 am 37d75513: Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS."
* commit '37d75513abbada67cd830094fbd30023da12ed11':
  Kill INCLUDE_SYS_MOUNT_FOR_STATFS.
2014-11-20 23:00:34 +00:00
Elliott Hughes 37d75513ab Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS." 2014-11-20 21:03:29 +00:00
Elliott Hughes c9b2472b50 Kill INCLUDE_SYS_MOUNT_FOR_STATFS.
Change-Id: If3ff83c475921d72936a19317e356549d1706fab
2014-11-20 12:58:26 -08:00
Ying Wang 1a5f13701a am 51840e4b: Support journal size board config variables. automerge: e91b83d
* commit '51840e4b2b87c5b7b045ebac412b0b3d1501643e':
  Support journal size board config variables.
2014-11-20 20:28:05 +00:00
Ying Wang 51840e4b2b Support journal size board config variables.
automerge: e91b83d

* commit 'e91b83d5e607031ab3da4f85cbb11a823aacf9ed':
  Support journal size board config variables.
2014-11-20 20:22:33 +00:00
Ying Wang 37ffc81d4d am 79d8f41e: Merge "Fix building on modern versions of Xcode and OS X."
* commit '79d8f41e1d5490784288e2a0737be334ef50e7f6':
  Fix building on modern versions of Xcode and OS X.
2014-11-20 17:27:36 +00:00
Ying Wang 276a543e71 am ea6113f0: Merge "arm: Support qemu-android on generic arm targets"
* commit 'ea6113f0f1a7069f1dd16bb2c0c7c29700bfda96':
  arm: Support qemu-android on generic arm targets
2014-11-20 17:27:35 +00:00
Ying Wang 79d8f41e1d Merge "Fix building on modern versions of Xcode and OS X." 2014-11-20 17:18:37 +00:00
Ying Wang ea6113f0f1 Merge "arm: Support qemu-android on generic arm targets" 2014-11-20 17:17:55 +00:00
Yabin Cui a4fa3d601f am aecf9022: Merge "kill HAVE_PREAD"
* commit 'aecf90220c094274d3155b02490f7a00ead72f4e':
  kill HAVE_PREAD
2014-11-20 05:21:52 +00:00
Yabin Cui aecf90220c Merge "kill HAVE_PREAD" 2014-11-20 05:15:15 +00:00
Yabin Cui 1acc2a1877 kill HAVE_PREAD
Bug: 18397613
Change-Id: I0061f8080709449f13dc76ce61097a2671c799ff
2014-11-19 20:48:36 -08:00
Dirk Dougherty 8c657dc214 am b87e3000: Support langs.
* commit 'b87e300056f2141c80f0cf895af0c1bc708a3542':
  Support langs.
2014-11-20 00:03:25 +00:00
Dirk Dougherty b87e300056 Support langs.
Change-Id: Ia01e4b41f0ebf2c54669428eef143dce5611d0bd
2014-11-19 23:31:03 +00:00
Ying Wang e91b83d5e6 Support journal size board config variables.
A device can set up BOARD_SYSTEMIMAGE_JOURNAL_SIZE (number of journal blocks)
in its BoardConfig.mk.
To disable journaling, set "BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0".

BOARD_VENDORIMAGE_JOURNAL_SIZE and BOARD_OEMIMAGE_JOURNAL_SIZE work in
similar way.

Bug: 18430740

(cherry picked from commit f3b86357e2)

Change-Id: Icc6c7e1b3be25b8e21b6a737492d944428e4a35a
2014-11-19 13:48:30 -08:00
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
Ying Wang f1021dcb61 am 6ead56be: am f3b86357: Support journal size board config variables.
* commit '6ead56bed56e3927575726bdebf8511e44f6fb47':
  Support journal size board config variables.
2014-11-19 19:28:23 +00:00
Ying Wang 6ead56bed5 am f3b86357: Support journal size board config variables.
* commit 'f3b86357e20a31ef0febe254f1f08706006f57fa':
  Support journal size board config variables.
2014-11-19 19:23:41 +00:00
Ying Wang e55efcdde5 am 471e60d6: Merge "Use ALL_MODULES..INSTALLED in modules-for-tag-list"
* commit '471e60d6a89ada5a9ed322d200fbe14eb07764ff':
  Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list
2014-11-19 19:00:32 +00:00
Ying Wang 471e60d6a8 Merge "Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list" 2014-11-19 18:53:19 +00:00
Yabin Cui a9653012fb am 9f7c5fef: Merge "kill HAVE_MADVISE"
* commit '9f7c5fef0e7c00d00c67242c2a360911b53374e0':
  kill HAVE_MADVISE
2014-11-19 04:31:49 +00:00
Yabin Cui 9f7c5fef0e Merge "kill HAVE_MADVISE" 2014-11-19 04:26:20 +00:00
Ying Wang f3b86357e2 Support journal size board config variables.
A device can set up BOARD_SYSTEMIMAGE_JOURNAL_SIZE (number of journal blocks)
in its BoardConfig.mk.
To disable journaling, set "BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0".

BOARD_VENDORIMAGE_JOURNAL_SIZE and BOARD_OEMIMAGE_JOURNAL_SIZE work in
similar way.

Bug: 18430740
Change-Id: I0594814fe19ffc54dff41ec2464e2e3a802b9419
2014-11-18 18:19:43 -08:00
Yabin Cui 16ccc03746 kill HAVE_MADVISE
Bug: 18397020
Change-Id: I6b9c7d30432858131379759e738d3e04bc8d5fb5
2014-11-18 18:14:37 -08:00
Ying Wang 0217e3b20b resolved conflicts for merge of a4f415d6 to lmp-mr1-dev-plus-aosp
Change-Id: Ibb54bce20342bd386ec85388d48c1c08e8b80197
2014-11-18 16:28:04 -08:00
Ying Wang a4f415d65e am ea4dfb75: Merge "Support prebuilt apk source selection based on PRODUCT_AAPT_PREF_CONFIG" into lmp-mr1-dev
* commit 'ea4dfb7551e680f7496e1d35c05bdad10ca58b4a':
  Support prebuilt apk source selection based on PRODUCT_AAPT_PREF_CONFIG
2014-11-19 00:23:00 +00:00
Andreas Gampe 9a186a1c6d am 56d5ed19: am bce1889b: am f318cc43: (-s ours) Build: Support for compiled-classes file
* commit '56d5ed1978309ce56256dbca0093054f17709252':
  Build: Support for compiled-classes file
2014-11-19 00:20:38 +00:00
Ying Wang ea4dfb7551 Merge "Support prebuilt apk source selection based on PRODUCT_AAPT_PREF_CONFIG" into lmp-mr1-dev 2014-11-19 00:18:54 +00:00
Andreas Gampe 56d5ed1978 am bce1889b: am f318cc43: (-s ours) Build: Support for compiled-classes file
* commit 'bce1889b8922fbbc2695756d3723029d4fd4cf66':
  Build: Support for compiled-classes file
2014-11-19 00:14:46 +00:00
Andreas Gampe bce1889b89 am f318cc43: (-s ours) Build: Support for compiled-classes file
* commit 'f318cc436a0d7db372e03424a344c8dc9839d183':
  Build: Support for compiled-classes file
2014-11-19 00:10:28 +00:00
Andreas Gampe 41c939a186 am 44259e4c: Merge "Build: Support for compiled-classes file"
* commit '44259e4cc64bd0382fb27f6d7540c7494db198cc':
  Build: Support for compiled-classes file
2014-11-18 23:39:07 +00:00
Andreas Gampe 44259e4cc6 Merge "Build: Support for compiled-classes file" 2014-11-18 23:31:50 +00:00
Andreas Gampe c9669d9e09 am 8bde9873: Merge "core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files"
* commit '8bde98733bb974253203ecbd5e62e32ef62e66ba':
  core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
2014-11-18 23:13:56 +00:00
Andreas Gampe 96a522037f Build: Support for compiled-classes file
Allow a compiled-classes file for pre-opting.

Bug: 18410571

(cherry picked from commit 4fec0bb265)

Change-Id: I8c69dd0fb8c04aaae0c4f062049cc9cce7d755c7
2014-11-18 15:09:51 -08:00