Commit Graph

10777 Commits

Author SHA1 Message Date
Shawn Willden
f041559cd4 Describe required format for for PLATFORM_SECURITY_PATCH
Hardware-backed keystore attestation and version binding rely on
PLATFORM_SECURITY_PATCH having the format YYYY-MM-DD.

Bug: 22914603
Change-Id: If116e3ca5611920021b098d6b610ae609956aa5c
2016-03-30 07:55:32 -06:00
Sebastien Hertz
8f0e52c3a6 Keep emma files for host rules
Keep coverage.em file name for host rules where Jack is not called.

(Partially reverts change 491c9ce48a)

Bug: 27822188
Change-Id: Ia9344e17ecbecfb9c335608740ab7dc5490c48d5
2016-03-30 09:39:18 +02:00
Dan Willemsen
89ab6f6969 Merge "Darwin: Use the same ar as Soong" am: a223b1c
am: ef75289

* commit 'ef752894ea7f8d176f0cf41fc53014113ee16d8b':
  Darwin: Use the same `ar` as Soong

Change-Id: I04ba9a5cbac3a5a2d539c1984cf1e45ece8516f3
2016-03-30 00:53:19 +00:00
Dan Willemsen
ef752894ea Merge "Darwin: Use the same ar as Soong"
am: a223b1c

* commit 'a223b1cff7e943369364e60656a837f8fb2015dc':
  Darwin: Use the same `ar` as Soong

Change-Id: I177f8a25158dbc2bb93b2c452fe52f7fb350b060
2016-03-30 00:49:50 +00:00
Dan Willemsen
6a54a9f10a Darwin: Use the same ar as Soong
Soong uses the copy of `ar` in the OSX SDK instead of the wrapper in
/usr/bin/ar. /usr/bin/ar appears to be a thin wrapper that looks up the
current SDK and passes execution to it. Soong does this so that it can
actually set up a dependency on the tool.

Change-Id: Ia4e4fbe3287539933fa98a1354c3ccee91f4d552
2016-03-29 16:21:32 -07:00
Ying Wang
6704f7e162 Merge "Set PRIVATE_TARGET_AAPT_CHARACTERISTICS even when running with the old aapt" into nyc-dev
am: 19b8145

* commit '19b81454479b2f6c438593304cd8c8f4c9ca77bc':
  Set PRIVATE_TARGET_AAPT_CHARACTERISTICS even when running with the old aapt

Change-Id: I4ebd15e849f5dd2c57c4e8679d140f184f999fa1
2016-03-29 21:39:28 +00:00
Ying Wang
19b8145447 Merge "Set PRIVATE_TARGET_AAPT_CHARACTERISTICS even when running with the old aapt" into nyc-dev 2016-03-29 21:31:24 +00:00
Allen Hair
eda71810b8 Merge "Only add jacocoagent if the package contains some java code." into nyc-dev 2016-03-29 21:18:24 +00:00
Dan Willemsen
a586820428 Merge "Forbid Clang for Windows" am: e4d5e08
am: 1eb2442

* commit '1eb24425d04d64d1811bc34c6395179fa3cfd526':
  Forbid Clang for Windows

Change-Id: I51432b0f6782422dd424edbbecab9a5b936be8f2
2016-03-29 21:02:56 +00:00
Dan Willemsen
1eb24425d0 Merge "Forbid Clang for Windows"
am: e4d5e08

* commit 'e4d5e08c2ec0d9db6b2baa160d4bf847331a331f':
  Forbid Clang for Windows

Change-Id: Idf4637ba20b1744f33b7425384ce1759b87c8fe3
2016-03-29 20:59:52 +00:00
Dan Willemsen
e4d5e08c2e Merge "Forbid Clang for Windows" 2016-03-29 20:54:24 +00:00
Shinichiro Hamaji
fbd5d8de0f Merge "Fix dependencies around tools/*-event-log-tags.py" am: 4487319
am: a2be61e

* commit 'a2be61ed16bcb406030ff01a30e4dec90a8ff5de':
  Fix dependencies around tools/*-event-log-tags.py

Change-Id: I8fee3f7846e723d46eb26356798eedb9566f3a28
2016-03-29 20:51:05 +00:00
Shinichiro Hamaji
a2be61ed16 Merge "Fix dependencies around tools/*-event-log-tags.py"
am: 4487319

* commit '4487319141c9447b8ef88e1d5ac9e8ecea7c619b':
  Fix dependencies around tools/*-event-log-tags.py

Change-Id: I35ce90562fc3ad6b9db20ac85b095debc904746c
2016-03-29 20:48:00 +00:00
Shinichiro Hamaji
4487319141 Merge "Fix dependencies around tools/*-event-log-tags.py" 2016-03-29 20:40:31 +00:00
Ying Wang
6f9bd2a972 Set PRIVATE_TARGET_AAPT_CHARACTERISTICS even when running with the old aapt
In commit e758f9319d we switched from
TARGET_AAPT_CHARACTERISTICS to PRIVATE_TARGET_AAPT_CHARACTERISTICS in
add-assets-to-package but forgot to set the variable when we are running
the old aapt.

Bug: 27874886
Change-Id: I03ced3030dcb9f024eef5b23dbfd5d99157952ea
2016-03-29 12:41:42 -07:00
Dan Willemsen
9537477df7 Forbid Clang for Windows
Clang and MinGW are not expected to work together currently, and you get
strange errors when this is attempted. Instead, error out with a clear
error message.

Before the windows build rewrite, we'd just explicitly set my_clang to
false without checking what the module asked for. Now, error out if the
module explicitly asked for clang, since by default they'd have it
already if it wasn't for windows. That way when Clang+Windows does
become possible, it can gradually be tested by setting LOCAL_CLANG to
true.

Change-Id: I9e0b0dca30946d94894119443f2fd0593cee1793
2016-03-29 12:34:03 -07:00
Colin Cross
ecc9970127 Remove -d keepdepfile from ninja command line DO NOT MERGE
am: 4aca571

* commit '4aca5715523d1b8a85abde00d7ccc2989c90a96b':
  Remove -d keepdepfile from ninja command line DO NOT MERGE

Change-Id: Ie978a4113e3098b11eb263d326ba31ec7b2275fa
2016-03-29 19:31:40 +00:00
Allen Hair
0b900e7223 Merge "Only add jacocoagent if the package contains some java code." am: 616f086
am: d05fb8f

* commit 'd05fb8ff844864cf1c794ea31bc8c0b8c120c8a2':
  Only add jacocoagent if the package contains some java code.

Change-Id: I31ffd74f6b698be7e154501997de740071ec6865
2016-03-29 19:28:45 +00:00
Allen Hair
d05fb8ff84 Merge "Only add jacocoagent if the package contains some java code."
am: 616f086

* commit '616f08696e69b52207929e99fc66c65e7566dc5d':
  Only add jacocoagent if the package contains some java code.

Change-Id: I056b15c99218de8636703f38cde23d6fef8b9577
2016-03-29 19:25:50 +00:00
Colin Cross
4aca571552 Remove -d keepdepfile from ninja command line DO NOT MERGE
keepdepfile is not supported by the ninja prebuilt in nyc-dev.

Bug: 27886012
Change-Id: Ia4f0b15916618b1b7caa2abb53e25f87737b5288
2016-03-29 12:10:53 -07:00
Shinichiro Hamaji
0f846c73e1 Replace last -includes by .KATI_DEPFILE
There was a typo in binary.mk. compile-dotdot-XXX-file in
definitions.mk was also using -include.

Bug: 26839129
Bug: 27886012
Change-Id: I4a0145fb70413998cc65d30d2efcd68af07b4800
(cherry picked from commit 72904774a3)
2016-03-29 12:10:48 -07:00
Shinichiro Hamaji
2fb7b61a2e Use KATI_DEPFILE for .P associated with object files
Also specify "-d keepdepfile" to ninja so .P files won't be
deleted by ninja.

-include for .s files are removed because GCC doesn't
generate .d files for .s files.

Bug: 26839129
Bug: 27886012
Change-Id: If00e93c7a33449ec314a5cdba438475a32979f4e
(cherry picked from commit 4037c4225a)
2016-03-29 12:10:03 -07:00
Shinichiro Hamaji
d3ce14c325 Fix dependencies around tools/*-event-log-tags.py
We should regenerate merged tag files and java sources when
these scripts are updated.

Change-Id: Id5f11d6f480f3f74dab08f01e929ee2d7fafd2d0
2016-03-30 03:04:40 +09:00
Allen Hair
29b65c4e66 Only add jacocoagent if the package contains some java code.
Bug: 27877982
Change-Id: I8bf05d67a823402e7e488990753cc9005ec5e90b
2016-03-29 10:47:49 -07:00
Sebastien Hertz
eff5d9d0e1 Merge "Rename emma coverage files" am: f7e06ef
am: dbad7c2

* commit 'dbad7c237cf04f799d680e7e9920848a17ff4f5c':
  Rename emma coverage files

Change-Id: Id35b2972bd208391c5f6cfd4490437ca7e119052
2016-03-29 07:26:19 +00:00
Sebastien Hertz
dbad7c237c Merge "Rename emma coverage files"
am: f7e06ef

* commit 'f7e06ef3b40da7931cee62210f880b7cb00787ce':
  Rename emma coverage files

Change-Id: I39a861d672f754f1b3380838ad9b45d584f5c7a7
2016-03-29 07:23:11 +00:00
Sebastien Hertz
f7e06ef3b4 Merge "Rename emma coverage files" 2016-03-29 07:17:12 +00:00
Baligh Uddin
ce49c77515 Add ability to package verifiedboot keys
am: f9d6850

* commit 'f9d685008d573bc34b247e586ff45588a2fdb808':
  Add ability to package verifiedboot keys
2016-03-28 22:24:57 +00:00
Baligh Uddin
f9d685008d Add ability to package verifiedboot keys 2016-03-28 13:09:03 -07:00
Allen Hair
0f85562384 Only add jacocoagent if the package contains some java code.
Bug: 27877982
Change-Id: I8bf05d67a823402e7e488990753cc9005ec5e90b
2016-03-28 12:52:37 -07:00
Ying Wang
7eeb880f33 resolve merge conflicts of cf19c3d to nyc-dev-plus-aosp
Change-Id: I8cec69daed3988de216538f33fd7462258175225
2016-03-25 19:22:59 -07:00
Ying Wang
cf19c3d0b4 Merge "Remove javac support in host dex rules."
am: 8fe0fc9

* commit '8fe0fc90653bfd40634d946002fd0e12b59f1022':
  Remove javac support in host dex rules.
2016-03-26 01:46:49 +00:00
Ying Wang
8fe0fc9065 Merge "Remove javac support in host dex rules." 2016-03-26 01:41:38 +00:00
Ying Wang
550e885f47 Merge "[DO NOT MERGE] Remove code pulled in by accident." 2016-03-26 01:27:32 +00:00
Ying Wang
40a4a83c90 [DO NOT MERGE] Remove code pulled in by accident.
Remove code pulled in by accident in cherry-pick commit fbc5b9f56.

Change-Id: I4e4a336faf71782c208631c581b2587a5364212f
2016-03-25 18:24:42 -07:00
Ying Wang
77f67cd048 Merge "Support x86+arm multilib build."
am: d314805

* commit 'd314805c29fdbee3508b99c14ca63e1a8d170c3b':
  Support x86+arm multilib build.
2016-03-25 21:51:21 +00:00
Shinichiro Hamaji
a73d4297a0 Link everything in libpthread.a to ckati
With this workaround, we can delete a lot of unnecessary code
in ckati: https://github.com/google/kati/commit/8380fb8525adfb5

Bug: 26839129
Change-Id: I3de1bf4cd6f2a65ee9322e8504459621871612fc
(cherry picked from commit f4511161d5)
2016-03-25 14:01:16 -07:00
Ying Wang
87538e4f8b Support x86+arm multilib build.
Support TARGET_2ND_ARCH as the binary translation arch.
See target/board/generic_x86_arm/BoardConfig.mk and
target/product/aosp_x86_arm.mk as example for the setup.

In BoardConfig, use the TARGET_2ND_ARCH/etc. variables to set up the
binary translation arch;
Set "TARGET_TRANSLATE_2ND_ARCH := true" to tell the build system it's
not a typical 64-bit multilib configuration.
In product makefile, use "PRODUCT_PACKAGES += libfoo_<2nd_arch>" to
install the TARGET_2ND_ARCH libraries. This also pulls in any dependency
libraries.
By default we don't install any TARGET_2ND_ARCH modules, unless it's
pulled in by PRODUCT_PACKAGES.

Bug: 27526885
Change-Id: I0578e9c80da0532d2fa886a8fcdb140bbc703009
(cherry-pick from commit 277e75a488)
2016-03-25 13:29:53 -07:00
Colin Cross
6e6a167521 Merge "Ignore Android.mk files with USE_SOONG=true" into nyc-dev
am: c031c75

* commit 'c031c758c63c83679cf55abb50ba9e4474d22814':
  Ignore Android.mk files with USE_SOONG=true
2016-03-25 19:59:02 +00:00
Colin Cross
c031c758c6 Merge "Ignore Android.mk files with USE_SOONG=true" into nyc-dev 2016-03-25 19:54:30 +00:00
Ying Wang
dcb1da9093 Merge "Remove rmtypedefs from the build system."
am: 6557ba5

* commit '6557ba5335798627572669512489fdc8c59915a6':
  Remove rmtypedefs from the build system.
2016-03-25 18:08:55 +00:00
Ying Wang
363fe53450 Use $(BUILD_SYSTEM) as the LOCAL_PATH of auto-generated modules.
So that we don't mess up with the vendor path check by accident.

Bug: 27543283
Change-Id: I6c34caefe3ff4abfdd8349a32c68fcca524cfd8e
(cherry-pick from commit efaf5efd06)
2016-03-25 11:06:51 -07:00
Ying Wang
fbc5b9f56b Rebuild odex files in PDK fusion build.
To rebuild odex files of Java libraries and apps,
we store the jars/apks without stripping the classes.dex inside the
platform.zip. We also save the build variables that may affect how we
rebuild an odex in pdk_dexpreopt_config.mk in the platform.zip.
We store the files and configuration only for libraries/apps that get
installed to the system.img (or vendor.img).

In PDK fusion build, we auto-generate prebuilt module definitions for
the javalib.jar and package.dex.apk carried in the platform.zip, using
configuration stored in pdk_dexpreopt_config.mk.
With the prebult modules, we override the implicit rule that directly
copies the odex from the platform.zip.
To rebuild odex of javalib.jar, we added support for prebuilt shared Java
library to prebiult_internal.mk. An installable prebuilt Java library is
treated as shared Java library, i.e. with classes.dex in the jar instead
of a set of .class files.
For apks in the platform.zip, we install the stripped version from
platform files inside platform.zip, instead of the package.dex.apk,
using a new variable LOCAL_REPLACE_PREBUILT_APK_INSTALLED. We can't
strip package.dex.apk because we can't re-sign the stripped apk at this
point.

We generate prebuilt module only if it's not already defined in the
source tree.

Bug: 27543283
Change-Id: I9e146f8b713d6f57c397fd28d88c9ab700757ca1
(cherry-pick from commit 3a61eeb6cb)
2016-03-25 11:06:04 -07:00
Ying Wang
6557ba5335 Merge "Remove rmtypedefs from the build system." 2016-03-25 17:29:30 +00:00
Sebastien Hertz
491c9ce48a Rename emma coverage files
We no longer use emma with Jack. However, during the process of a
full build, we may run the emma task and overwrite the coverage file
generated by Jack with the one from emma because they use the same
filename.

This CL renames coverage files generated by emma so they no longer
break those created by Jack.

Bug: 27822188
Change-Id: Ie3fdc2b8f53deafbefbd6973e39f29d8c46f371e
2016-03-25 17:11:38 +01:00
Ying Wang
7e28fd855d Use as the LOCAL_PATH of auto-generated modules.
am: efaf5ef

* commit 'efaf5efd06ce0caf739ce48690f2384b37a791d5':
  Use $(BUILD_SYSTEM) as the LOCAL_PATH of auto-generated modules.
2016-03-25 00:45:04 +00:00
Ying Wang
efaf5efd06 Use $(BUILD_SYSTEM) as the LOCAL_PATH of auto-generated modules.
So that we don't mess up with the vendor path check by accident.

Bug: 27543283
Change-Id: I6c34caefe3ff4abfdd8349a32c68fcca524cfd8e
2016-03-24 17:24:38 -07:00
Ying Wang
3ae7861252 Remove javac support in host dex rules.
- Remove javac support in host_dalvik_java_library.mk
- Simplify host_dalvik_static_java_library.mk by including
  host_dalvik_java_library.mk instead of host_java_library.mk.
- Take configure_local_jack out of host_java_library_common.mk because
  it's only needed by host dalvik java libraries.

Bug: 27400061
Change-Id: I4088b09092198118d832a759663bbaadff669ed5
2016-03-24 16:48:47 -07:00
Johan Redestig
90adcf0d66 Merge "Add libbase to otatools"
am: 20d4e10

* commit '20d4e10bf399932c9e91d535fd0fb54301552210':
  Add libbase to otatools
2016-03-24 22:42:44 +00:00
Tao Bao
20d4e10bf3 Merge "Add libbase to otatools" 2016-03-24 21:50:37 +00:00