Commit graph

16760 commits

Author SHA1 Message Date
Michael Runge
c6e3afd26d Support block OTA + OEM partition
Change-Id: I9e662098569a43b05279908e6833e9552a7abe3a
2014-05-05 12:22:12 -07:00
Michael Runge
6e836116f7 Add support for verifying OEM properties.
A separate OEM file must be specified to provide the expected
values for these properties.  The list of properties comes from
the "oem_fingerprint_properties" list in misc_info.txt

Bug: b/13367676

Change-Id: I1a3eaf108492132cf6f595a5d1c9f7e0c3cb3142
2014-05-01 17:37:57 -07:00
Torne (Richard Coles)
a1215ab943 am 2b2a4953: am f0b5bfec: am a0267df2: Merge "Remove libpac and v8 from the 64-bit blacklist."
* commit '2b2a495317f5b08d4b64ab7c95955b0cf8d0232e':
  Remove libpac and v8 from the 64-bit blacklist.
2014-05-01 09:31:59 +00:00
Torne (Richard Coles)
2b2a495317 am f0b5bfec: am a0267df2: Merge "Remove libpac and v8 from the 64-bit blacklist."
* commit 'f0b5bfec7b0a715cd09da7540f0a772e31b65c71':
  Remove libpac and v8 from the 64-bit blacklist.
2014-05-01 09:25:02 +00:00
Torne (Richard Coles)
f0b5bfec7b am a0267df2: Merge "Remove libpac and v8 from the 64-bit blacklist."
* commit 'a0267df234db59d34891a01e0761233abc9ae4b1':
  Remove libpac and v8 from the 64-bit blacklist.
2014-05-01 09:20:19 +00:00
Torne (Richard Coles)
a0267df234 Merge "Remove libpac and v8 from the 64-bit blacklist." 2014-05-01 09:17:26 +00:00
Tim Murray
93dc057826 am cf53e0e0: am 27fe9406: am 7e65b6c1: Merge "Remove tblgen and clang-tblgen from prebuilts."
* commit 'cf53e0e0aaf569d7e76472e2958dca5a44f45df2':
  Remove tblgen and clang-tblgen from prebuilts.
2014-04-30 23:35:46 +00:00
Tim Murray
cf53e0e0aa am 27fe9406: am 7e65b6c1: Merge "Remove tblgen and clang-tblgen from prebuilts."
* commit '27fe940676b568bb9a0af889028495fab73853f2':
  Remove tblgen and clang-tblgen from prebuilts.
2014-04-30 21:54:08 +00:00
Tim Murray
27fe940676 am 7e65b6c1: Merge "Remove tblgen and clang-tblgen from prebuilts."
* commit '7e65b6c1e53a51db0aa65126f2453f27daa0f22f':
  Remove tblgen and clang-tblgen from prebuilts.
2014-04-30 21:52:33 +00:00
Tim Murray
7e65b6c1e5 Merge "Remove tblgen and clang-tblgen from prebuilts." 2014-04-30 21:49:35 +00:00
Tim Murray
75b58cc827 Remove tblgen and clang-tblgen from prebuilts.
Change-Id: I89fb74da5a516d0f768f72518a401216f8a5b1a8
2014-04-30 13:54:32 -07:00
Colin Cross
e5381d074f Merge "verity: clean up verity build dependencies" 2014-04-30 20:47:58 +00:00
Narayan Kamath
666bc68509 am 7d26e97e: am 3f1d1608: am 475a3d17: Merge "Use java_home to determine jdk location."
* commit '7d26e97e7f7ecc8ee7af373d5a5e3c96d317c910':
  Use java_home to determine jdk location.
2014-04-30 17:35:41 +00:00
Narayan Kamath
7d26e97e7f am 3f1d1608: am 475a3d17: Merge "Use java_home to determine jdk location."
* commit '3f1d1608ebc4a0c307c94b67943bee004d8428a1':
  Use java_home to determine jdk location.
2014-04-30 15:37:38 +00:00
Narayan Kamath
3f1d1608eb am 475a3d17: Merge "Use java_home to determine jdk location."
* commit '475a3d17d7594ee2b8bcf1ac826c490b49f116df':
  Use java_home to determine jdk location.
2014-04-30 15:12:53 +00:00
Narayan Kamath
475a3d17d7 Merge "Use java_home to determine jdk location." 2014-04-30 10:45:51 +00:00
Jason Parks
30cfbd756b Use java_home to determine jdk location.
Specifying the major version rather than hard coding
to a minor version.

(cherry-picked from commit 13b2e19ef2)

Change-Id: Ie2c08d35fcff2129b26c1dfa8a2e5cd7b19c4b49
2014-04-30 11:43:00 +01:00
Bill Yi
5c39bb4f5e am 6a275202: am 1e4adfa8: (-s ours) Merge commit \'8113e43601aac7702b9ec007e81a179826143d1e\' into HEAD
* commit '6a27520295601f53ae80d1e764e072162e9f481c':
  Try to catch more misuse of $(my-dir).
  Revert "Remove external/chromium from the 64 bit blacklist."
  Remove external/chromium from the 64 bit blacklist.
  OProfile is no longer compiled now.
  Amend 64 bit blacklist.
  DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
  DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
  Remove external/tcpdump from 64-bit build blacklist.
  oprofile/daemon doesn't build for x86_64.
  Remove external/wpa_supplicant_8 and external/android-clat
  Take libcore off the LP64 blacklist.
  HACK: add 64-bit directory blacklist
  add support for module supported or unsupported target architectures
2014-04-30 00:52:58 +00:00
Bill Yi
6a27520295 am 1e4adfa8: (-s ours) Merge commit \'8113e43601aac7702b9ec007e81a179826143d1e\' into HEAD
* commit '1e4adfa837c77dc2dcb73ce2c0b32bf362e80000':
  Try to catch more misuse of $(my-dir).
  Revert "Remove external/chromium from the 64 bit blacklist."
  Remove external/chromium from the 64 bit blacklist.
  OProfile is no longer compiled now.
  Amend 64 bit blacklist.
  DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
  DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
  Remove external/tcpdump from 64-bit build blacklist.
  oprofile/daemon doesn't build for x86_64.
  Remove external/wpa_supplicant_8 and external/android-clat
  Take libcore off the LP64 blacklist.
  HACK: add 64-bit directory blacklist
  add support for module supported or unsupported target architectures
2014-04-30 00:49:23 +00:00
Ying Wang
09a4e6870d Add SDK product for arm64, x86_64 and mips64.
Bug: 14411602
Change-Id: Ia609321864ddade27df97448c8037f25c4ef99aa
2014-04-29 12:48:06 -07:00
Bill Yi
1e4adfa837 Merge commit '8113e43601aac7702b9ec007e81a179826143d1e' into HEAD 2014-04-29 11:32:53 -07:00
Torne (Richard Coles)
91d4944434 Remove libpac and v8 from the 64-bit blacklist.
external/chromium-libpac has been updated to depend on the copy of V8 in
external/chromium_org, and its makefiles updated to be multilib-safe.
external/v8 is thus unused and has been removed from the tree.

Bug: 12452053
Change-Id: I757fa187f7f67cd9a89d4b228d4ce3ed6d2858b1
2014-04-29 10:23:56 +01:00
Andrew Hsieh
293ccf9ae6 am d815dbd1: am f14ba5b9: am 8afa2555: Merge "Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib"
* commit 'd815dbd1343d05aae5f5430dc38d8846107d202b':
  Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib
2014-04-29 00:23:52 +00:00
Colin Cross
8a30f72c0c verity: clean up verity build dependencies
Move image dependencies out of PRODUCT_PACKAGES and into direct
dependencies for the image building rules.

Fix the test for PRODUCT_SUPPORTS_VERITY, it needs to check for
the current project as the global is no longer set.

Change-Id: I811501834ae5ec658229bd505fcc48275ff578c9
2014-04-28 17:19:04 -07:00
Andrew Hsieh
d815dbd134 am f14ba5b9: am 8afa2555: Merge "Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib"
* commit 'f14ba5b93583b33ad47b22b9de07c3907b8b5074':
  Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib
2014-04-29 00:12:01 +00:00
Andrew Hsieh
f14ba5b935 am 8afa2555: Merge "Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib"
* commit '8afa25552efb51286fe0f010f0bf78fea71fc12a':
  Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib
2014-04-29 00:08:21 +00:00
Andrew Hsieh
8afa25552e Merge "Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib" 2014-04-28 22:52:49 +00:00
Jason Parks
13b2e19ef2 Use java_home to determine jdk location.
Specifying the major version rather than hard coding
to a minor version.

Change-Id: Ieccec98c1b41e3eb7f512bcebc83f6034d634862
2014-04-28 13:32:38 -05:00
Jeff Sharkey
5ffee768ea Merge "Set up rules to build oem.img" 2014-04-28 16:51:12 +00:00
Ying Wang
b8888432f0 Set up rules to build oem.img
To build oem.img:
- You must define BOARD_OEMIMAGE_PARTITION_SIZE in your BoardConfig.mk
- The file system type will be the same as system.img and userdata.img.
- To install a module to oem.img, use "LOCAL_OEM_MODULE := true"
- run "make -j48 showcommands oem_image dist". By default it's not
  built.

Bug: 13367676
Change-Id: I1a26d4d0c61b72ecffe60279667b1b3de050780d
2014-04-28 09:43:51 -07:00
Torne (Richard Coles)
0b1204753e am 93d0245b: am 5646d2f6: am 7250b63a: Merge "Fix PATH setup for arm64."
* commit '93d0245bc9cebf68a677d59b2ada1f72f9ea2dd2':
  Fix PATH setup for arm64.
2014-04-28 16:12:00 +00:00
Torne (Richard Coles)
93d0245bc9 am 5646d2f6: am 7250b63a: Merge "Fix PATH setup for arm64."
* commit '5646d2f6aa851ca79440d573e73fa51cf6afaf81':
  Fix PATH setup for arm64.
2014-04-28 16:06:24 +00:00
Torne (Richard Coles)
5646d2f6aa am 7250b63a: Merge "Fix PATH setup for arm64."
* commit '7250b63a1a3e726aa83e2351b23f2d0c79903247':
  Fix PATH setup for arm64.
2014-04-28 16:00:30 +00:00
Torne (Richard Coles)
7250b63a1a Merge "Fix PATH setup for arm64." 2014-04-28 15:54:24 +00:00
Torne (Richard Coles)
f24c356a96 Fix PATH setup for arm64.
On architectures other than "arm", the combination of
ANDROID_KERNEL_TOOLCHAIN_PATH being empty, and CODE_REVIEWS being empty,
leads to adding a :: into the user's PATH, which is highly undesirable.

Neither CODE_REVIEWS nor the mips toolchaindir is ever used, so just
remove them, and make sure we only include the extra colon when setting
the kernel toolchain path to a non-empty value.

Change-Id: I2dfa7d3a322b56b6abbc47476082dc6ae4dd6a82
2014-04-28 15:25:21 +01:00
Andrew Hsieh
140761af09 Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib
prebuilts/ndk/current/platforms/android-19/arch-x86_64/usr/lib
is renamed to usr/lib64 to be more consistent with rest of
lib paths in x86_64 toolchain, which is multilib

See https://android-review.googlesource.com/#/c/92441/

Change-Id: I4e59245505d0fa87ae3608e81e715ccfcecc5ec8
2014-04-25 23:47:10 -07:00
Ying Wang
66750e6395 am d4cc9dad: am 1427f872: am 676e11fe: Merge "include LGPL projects in GPL archives"
* commit 'd4cc9dad6cf21e12b45b8b756a731d6e21c86c97':
  include LGPL projects in GPL archives
2014-04-25 22:52:04 +00:00
Stephen Hines
46df181815 am f0dda8d0: am 9661b09f: am 9956bb6a: Merge "Build changes necessary for LLVM 3.5 switch."
* commit 'f0dda8d0cbb249be24a71776289b1d9ebe17faaf':
  Build changes necessary for LLVM 3.5 switch.
2014-04-25 22:51:38 +00:00
Ying Wang
d4cc9dad6c am 1427f872: am 676e11fe: Merge "include LGPL projects in GPL archives"
* commit '1427f872b99c4e019fe0b5a75a283bed68814204':
  include LGPL projects in GPL archives
2014-04-25 22:03:07 +00:00
Ying Wang
1427f872b9 am 676e11fe: Merge "include LGPL projects in GPL archives"
* commit '676e11fed82c5a4afb02d1082472fad14e625915':
  include LGPL projects in GPL archives
2014-04-25 21:59:35 +00:00
Ying Wang
676e11fed8 Merge "include LGPL projects in GPL archives" 2014-04-25 21:56:27 +00:00
Stephen Hines
f0dda8d0cb am 9661b09f: am 9956bb6a: Merge "Build changes necessary for LLVM 3.5 switch."
* commit '9661b09ff1fb43014d7777b391531ebe59dd83bc':
  Build changes necessary for LLVM 3.5 switch.
2014-04-25 20:57:30 +00:00
Stephen Hines
9661b09ff1 am 9956bb6a: Merge "Build changes necessary for LLVM 3.5 switch."
* commit '9956bb6aebf5084b730e9f4ac4d00b3a7c4a2f27':
  Build changes necessary for LLVM 3.5 switch.
2014-04-25 20:53:02 +00:00
Stephen Hines
9956bb6aeb Merge "Build changes necessary for LLVM 3.5 switch." 2014-04-25 20:47:33 +00:00
Ying Wang
8d4562a14d resolved conflicts for merge of 0a694f4c to master
Change-Id: Idec6e6837c6329dae423a12fc084a11bca82463d
2014-04-25 09:28:00 -07:00
Ying Wang
0a694f4c57 am c564b691: Remove libs from target/product/base.mk.
* commit 'c564b691d55d4dcede7ce46248b1a87acf3d2618':
  Remove libs from target/product/base.mk.
2014-04-25 16:13:55 +00:00
Ying Wang
c564b691d5 Remove libs from target/product/base.mk.
LatinIME has libjni_latinime as dependency, so we don't need it in
PRODUCT_PACKAGES;
Moved libpac close to PacProcesser, which requires libpac.

Change-Id: I8674d76bcfde4c0e1f1b04bc96e636022d008576
2014-04-24 17:12:58 -07:00
Dianne Hackborn
6ee3c4327d Add new facility to have multiple active codenames.
Use this to have both L and KKWT.

Change-Id: I78cd5ed2dcffab9e93030184ba6f9eb9a6a3cba5
2014-04-24 16:19:14 -07:00
Tim Murray
43d5e1bbc4 Build changes necessary for LLVM 3.5 switch.
Change-Id: Icb6065daada7cb1d7425206830a4ef9e23454c03

Conflicts:
	core/clang/arm.mk
2014-04-24 13:14:32 -07:00
Elliott Hughes
52db54cc8e am bb21bfb0: am 7cad688e: am 847fd031: Merge "Leave \'linux\' defined on x86/x86-64, like arm."
* commit 'bb21bfb090c29be17473b318a0d54ec5bcc5243c':
  Leave 'linux' defined on x86/x86-64, like arm.
2014-04-24 16:32:55 +00:00