Commit Graph

19756 Commits

Author SHA1 Message Date
David 'Digit' Turner d0015f7173 Merge changes I152eb090,Ic40360bf
* changes:
  arm64: Fix the sdk_arm64 build products
  arm64: Fix aosp_arm64 system image.
2014-08-25 10:19:09 +00:00
Ying Wang ed21d4c016 Allow to overrde command make in envsetup.sh.
To override define function get_make_command() in vendor's
vendor-envsetup.sh.

Change-Id: I553e60816eb789750ccd16110f2e82a5087587e8
2014-08-24 22:14:57 -07:00
Ying Wang 3cff4f39b2 am da2da1d9: Fix aidl post clean bug.
* commit 'da2da1d9b858c7f63290614fc07c1a6de65eb031':
  Fix aidl post clean bug.
2014-08-23 17:01:19 +00:00
Ying Wang da2da1d9b8 Fix aidl post clean bug.
We really should check MODULES_WITH_AIDL_FILES against ALL_MODULES,
instead of modules_with_aidl_files, because a module could have just
remove any aidl files so it won't appear in modules_with_aidl_files.

Change-Id: Iab92be1ed5f0556b7236be41d90d8471c7193928
2014-08-23 09:45:31 -07:00
Doug Zongker fd1754a687 am 6f1d031b: take bootable images from target_files if present
* commit '6f1d031b39ca2c666edab5ce966d1329f85dee1e':
  take bootable images from target_files if present
2014-08-22 17:54:14 +00:00
Doug Zongker 6f1d031b39 take bootable images from target_files if present
Now that we're building and saving images in the target_files at build
time, we should use those images instead of rebuilding them.

Bug: 17201052
Change-Id: I459e650f66f1e0bdf01ad54df9e34f36bf2ee899
2014-08-22 10:25:57 -07:00
David 'Digit' Turner 46299f5efd arm64: Fix the sdk_arm64 build products
This patch fixes the sdk_arm64 system images to boot properly when run
under emulation with the new qemu-android binaries.

BUG=17154406

Change-Id: I152eb09086ce4abc4b623e54de78cdaaac6b90a1
2014-08-22 11:15:07 +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
Dehao Chen 19aa0acbf4 am 2d83365c: Merge "Add TARGET_FDO_LDFLAGS to make sure -lgcc is always linked after -lgcov." into lmp-dev
* commit '2d83365c9d852874bee790e2047178959933133e':
  Add TARGET_FDO_LDFLAGS to make sure -lgcc is always linked after -lgcov.
2014-08-21 17:52:54 +00:00
Dehao Chen 2d83365c9d Merge "Add TARGET_FDO_LDFLAGS to make sure -lgcc is always linked after -lgcov." into lmp-dev 2014-08-21 17:30:08 +00:00
Baligh Uddin 8883508aa9 am cc4c481b: Add en_AU as a supported locale
* commit 'cc4c481b8f6f57b964715cbdab56092db08000d9':
  Add en_AU as a supported locale
2014-08-21 16:41:59 +00:00
Baligh Uddin cc4c481b8f Add en_AU as a supported locale
Bug: 14587692
2014-08-21 16:04:26 +00:00
Elliott Hughes 5ba5283aee am 9f6ae4ba: am d61f0ffd: Merge "HAVE_FUTEX is unused."
* commit '9f6ae4ba5379df08d3bd6f60878718598bfa76d7':
  HAVE_FUTEX is unused.
2014-08-21 05:21:37 +00:00
Elliott Hughes 9f6ae4ba53 am d61f0ffd: Merge "HAVE_FUTEX is unused."
* commit 'd61f0ffdfc13ce7b563015ea5fdd4513fb7c9d59':
  HAVE_FUTEX is unused.
2014-08-21 05:08:47 +00:00
Elliott Hughes d61f0ffdfc Merge "HAVE_FUTEX is unused." 2014-08-21 04:59:53 +00:00
Elliott Hughes 8f36565bc9 am 242f0540: am a9ec8350: Merge "Remove HAVE_ANDROID_PTHREAD_SETNAME_NP."
* commit '242f054094c5cafcd1d92c7ab1ed7b4459aedbf3':
  Remove HAVE_ANDROID_PTHREAD_SETNAME_NP.
2014-08-21 04:35:00 +00:00
Elliott Hughes d397f4ec9f am 3a2fc08d: am 10f5a420: Merge "HAVE_OPEN_MEMSTREAM is no longer used."
* commit '3a2fc08ddcbc9ddec1fa65722515501a406afbf4':
  HAVE_OPEN_MEMSTREAM is no longer used.
2014-08-21 04:34:58 +00:00
Elliott Hughes 0fa6a4063d HAVE_FUTEX is unused.
I missed this the other day.

Change-Id: Ifb6912de3aae6d03593ffb08d8d9555dc9e53f4d
2014-08-20 21:26:19 -07:00
Elliott Hughes 242f054094 am a9ec8350: Merge "Remove HAVE_ANDROID_PTHREAD_SETNAME_NP."
* commit 'a9ec8350b05d3c46656344876cee897616f84f00':
  Remove HAVE_ANDROID_PTHREAD_SETNAME_NP.
2014-08-21 04:24:35 +00:00
Elliott Hughes 3a2fc08ddc am 10f5a420: Merge "HAVE_OPEN_MEMSTREAM is no longer used."
* commit '10f5a420eba1504fda05ff1e6347f4e78bdba2d8':
  HAVE_OPEN_MEMSTREAM is no longer used.
2014-08-21 04:24:34 +00:00
Elliott Hughes a9ec8350b0 Merge "Remove HAVE_ANDROID_PTHREAD_SETNAME_NP." 2014-08-21 04:20:34 +00:00
Elliott Hughes 10f5a420eb Merge "HAVE_OPEN_MEMSTREAM is no longer used." 2014-08-21 04:16:48 +00:00
Elliott Hughes 70f3f33c2d Remove HAVE_ANDROID_PTHREAD_SETNAME_NP.
https://android-review.googlesource.com/104945 removes the only user.

Change-Id: I303d941036ab889ab747f26561506a5e1c93f0c2
2014-08-20 20:21:29 -07:00
Geremy Condra 9a7bf7ede4 am 95ebe7a0: Use the specified verity key to sign boot and recovery OTA images.
* commit '95ebe7a09b61931fc9e84b3ce43439c1eda40308':
  Use the specified verity key to sign boot and recovery OTA images.
2014-08-21 02:48:14 +00:00
Dehao Chen f4294cd816 Add TARGET_FDO_LDFLAGS to make sure -lgcc is always linked after -lgcov.
Change-Id: I33a94abe58391a8564ada14417b0158ddd7ed2d6
2014-08-20 16:48:17 -07:00
Elliott Hughes 31c667ed3a HAVE_OPEN_MEMSTREAM is no longer used.
Bug: 17164505
Change-Id: I8055e52019d8cdea957d0fb8cbd46ca9b52564e1
2014-08-20 16:17:28 -07:00
Dan Albert c3733c7765 am 467f8f32: am df73a5fa: Merge "Performance improvement for whole static libs"
* commit '467f8f326b979b43b6be48d5294f0627cf8fdd71':
  Performance improvement for whole static libs
2014-08-20 21:28:49 +00:00
Dan Albert 467f8f326b am df73a5fa: Merge "Performance improvement for whole static libs"
* commit 'df73a5fa0a9b44aa3a76dcf1dc7bc6606e7b367a':
  Performance improvement for whole static libs
2014-08-20 21:22:42 +00:00
Geremy Condra 95ebe7a09b Use the specified verity key to sign boot and recovery OTA images.
This ensures that when the verity key is rotated to a release key
both the boot and recovery images will be correctly signed. It does
mean that they will both be signed with the same key for now, but
as that doesn't change the threat model separating them is just a
distant nice-to-have.

Bug: 15725238
Change-Id: I5b75e4346fe0655065643ab553431690cc1a8cb0
2014-08-20 20:17:01 +00:00
Dan Albert df73a5fa0a Merge "Performance improvement for whole static libs" 2014-08-20 18:44:22 +00:00
Dan Albert e0f44ac25d Performance improvement for whole static libs
Improves performance for LOCAL_WHOLE_STATIC_LIBS by copying the first .a
to the new .a rather than extracting and recreating

Change-Id: Iecdb5e4bb2ce987bb41a70c3393d18a6d72ae689
2014-08-20 13:58:36 -07:00
Jeff Brown 4576d5ef44 am 4faea310: Remove incomplete media router API. (DO NOT MERGE)
* commit '4faea310acb2e884192f3e760e3190426b9c6d0f':
  Remove incomplete media router API. (DO NOT MERGE)
2014-08-20 03:26:45 +00:00
Jeff Brown 4faea310ac Remove incomplete media router API. (DO NOT MERGE)
Change-Id: Icc0800e2cdb9b0a5ad2bcde760d9eefd0aea74ea
2014-08-19 19:44:46 -07:00
Geremy Condra 5b108e4632 am f19b365c: Add support for switching to verity release keys.
* commit 'f19b365cc9021104586d65385d246db06639fc46':
  Add support for switching to verity release keys.
2014-08-20 00:21:18 +00:00
Geremy Condra f19b365cc9 Add support for switching to verity release keys.
Bug: 15725238
Change-Id: I8f92210fd854b5a2567cf76aaecb5be02c3f9293
2014-08-20 00:05:23 +00:00
Ying Wang 179b81e0f8 am 9885ba95: Merge "Store a copy of installed-files.txt in DIST_DIR if system.img failed to build" into lmp-dev
* commit '9885ba95a4793a083d217a50ca251d212737c6d1':
  Store a copy of installed-files.txt in DIST_DIR if system.img failed to build
2014-08-19 21:42:08 +00:00
Ying Wang 9885ba95a4 Merge "Store a copy of installed-files.txt in DIST_DIR if system.img failed to build" into lmp-dev 2014-08-19 21:23:09 +00:00
Ying Wang ebe63fb0a0 Store a copy of installed-files.txt in DIST_DIR if system.img failed to build
Because we already have rule to store installed-files.txt in DIST_DIR,
to avoid the slim chance of race condition, this copy is named as
installed-files-rescued.txt

Change-Id: I9fa6d8aded0ad5de1f1422d70a4224b3fc308e75
2014-08-19 12:21:35 -07:00
Narayan Kamath 15f853533c am 24b7840a: Add CPU_ABIs for the second generic_arm64 architecture.
* commit '24b7840aa1ec4f7eb7ee06f0c75412f8779941c1':
  Add CPU_ABIs for the second generic_arm64 architecture.
2014-08-19 16:35:30 +00: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 ca0b172f82 am 2cdf9b26: Merge "Let aosp_arm64 / emulator assume NEON / cortex-a15." into lmp-dev
* commit '2cdf9b26fe033df7a6f308e26b7f28f2eb0a22e3':
  Let aosp_arm64 / emulator assume NEON / cortex-a15.
2014-08-19 09:21:45 +00:00
Michael Wright c869a51a4e am ec8aee21: Merge "Remove inputflinger from build. DO NOT MERGE" into lmp-dev
* commit 'ec8aee21583d014563c11735af0219b2bac23c0f':
  Remove inputflinger from build. DO NOT MERGE
2014-08-19 01:49:26 +00:00
Dehao Chen dcb92358c8 am 67ce4110: Merge "Check existance of profile directory for specific device." into lmp-dev
* commit '67ce41105eac775f90b129a295489a2ae3265cd1':
  Check existance of profile directory for specific device.
2014-08-18 23:12:25 +00:00
Michael Wright ec8aee2158 Merge "Remove inputflinger from build. DO NOT MERGE" into lmp-dev 2014-08-18 21:31:41 +00:00
Elliott Hughes 1653580011 am ccf7c39d: am 36ba1db4: Merge "Remove unused entries from AndroidConfig.h."
* commit 'ccf7c39d628ca5a2070c8f7972178156460d6125':
  Remove unused entries from AndroidConfig.h.
2014-08-18 19:52:55 +00:00
Elliott Hughes ccf7c39d62 am 36ba1db4: Merge "Remove unused entries from AndroidConfig.h."
* commit '36ba1db405637ef97276103fced526f5e5d9e354':
  Remove unused entries from AndroidConfig.h.
2014-08-18 19:38:37 +00:00
Ying Wang 7a415131cf Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/build into lmp-dev-plus-aosp 2014-08-18 19:35:59 +00:00
Dan Albert 37d058859b am 473dc3d4: am be0af1f7: Merge "Strip my_clang on assignment."
* commit '473dc3d416a29371085237c26f5df391d9698ec1':
  Strip my_clang on assignment.
2014-08-18 19:34:52 +00:00
Elliott Hughes 9b691ad231 am e70f4ed1: am f8d88579: Merge "Remove HAVE_GETTID."
* commit 'e70f4ed1d1bd558e04ab7ae181e7197c4e46e1b0':
  Remove HAVE_GETTID.
2014-08-18 19:34:51 +00:00
Ying Wang 6375bcaf5a am 46f9c08f: am d1f90c7e: am 0e541aea: am a76761f0: am f7115dbe: am 2888b790: am c48566fb: am 48b4f2b4: am ed7bdb8f: am 6d1f2c64: am 6afa19ab: am 40e0cfd3: am a5bb9a73: am 66c28d86: am 042e3b75: am a65eb8c7: Split to multiple bash commands.
* commit '46f9c08fb9e4811509c4a6de9393fabb6713a11c':
  Split to multiple bash commands.
2014-08-18 19:34:07 +00:00