Merge commit '1e0847c2fcbe1b95464f32a719d2b9e620d1e6ec'
* commit '1e0847c2fcbe1b95464f32a719d2b9e620d1e6ec':
core: Allow the board config to specify the kernel base address for mkbootimg
Merge commit '1f61dc3e19f1a18dabbc11ce6cf4a62851933ad0'
* commit '1f61dc3e19f1a18dabbc11ce6cf4a62851933ad0':
AI 148430: Adding a new CTS test runner that is basically
Merge commit '6178820340ccca2656fab0953bbe77da2e3e4bb7' into donut
* commit '6178820340ccca2656fab0953bbe77da2e3e4bb7':
AI 148430: Adding a new CTS test runner that is basically
a copy of the old one, but resides in android/cts
and is built and installed as part of the CTS.
This makes sure we always have the correct test
runner on a device, so we should see the various
improvements also on off-the-shelf Cupcake phones.
BUG=1537738
Automated import of CL 148430
Until now only generated assembly or C++ files would be compiled. This patch extends the build
system to compile generated C files as well. The new rule is modeled on the existing rules for
compiling generated C++ files and the existing rule for compiling ordinary C files.
* changes:
Change 77 from git master branch: change the prelink-linux-arm.map to include OC 2.0 new shared libs - remove redundant share lib from the map - remove 2way share lib from the map
Merge commit '7b2845ab1a47324a6fb25261048510e79656a732'
* commit '7b2845ab1a47324a6fb25261048510e79656a732':
Don't rebuild the NOTICE files when building with mm, mmm, etc.
Merge commit 'e468abda1c64923908ae711743d3e8c9f1b4a477'
* commit 'e468abda1c64923908ae711743d3e8c9f1b4a477':
AI 147775: Also add ApiDemos to make sure it gets included in the TestCase repository as
Merge commit 'ecc08d02b18f67a84df2f69e0d807761fc8dad15'
* commit 'ecc08d02b18f67a84df2f69e0d807761fc8dad15':
AI 147731: Forgot to submit the build changes for the
Merge commit '41ddfa903fe4e91e51d978d30bbbe6748ed1f100'
* commit '41ddfa903fe4e91e51d978d30bbbe6748ed1f100':
AI 147479: Update list of CTS test packages.
Merge commit 'ccd2def288d02ce5adab10bb28878fff05b70aed' into donut
* commit 'ccd2def288d02ce5adab10bb28878fff05b70aed':
AI 147847: CTS: Fix core test dependencies in CTS makefile
Merge commit 'f22b9a0ad531f66eb0b5710abae1feefecc42c2b' into donut
* commit 'f22b9a0ad531f66eb0b5710abae1feefecc42c2b':
AI 147775: Also add ApiDemos to make sure it gets included in the TestCase repository as
Merge commit 'b3e0126a7a2d32fbae2638e9419739d2d3907c40' into donut
* commit 'b3e0126a7a2d32fbae2638e9419739d2d3907c40':
AI 147731: Forgot to submit the build changes for the
Merge commit 'f23f5b486650a923e58e3e79b8ec23cc725b7b33' into donut
* commit 'f23f5b486650a923e58e3e79b8ec23cc725b7b33':
AI 147479: Update list of CTS test packages.
The core test descriptions did not list all dependencies. When building cts
for the first time, the descriptions were generated before the cts
repository was erased.
BUG=1813815
Automated import of CL 147847
apks. Each libcore module gets one apk and luni gets 4.
Original author: ursg
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146827
This is only a preliminary CL. More will follow but this is
a good start, with the following caveats:
What it does:
- take an input jar, a list of includes, a list of excludes.
- generate actual Java source for the filtered classes.
What it doesn't do yet:
- some more work on filtering inner elements (methods, etc.)
- properly generate inner classes.
- hide synthetic fields.
- some classes body are missing
- directly generate a stubbed bytecode/jar rather than source.
I'll likely want to keep the source generator for debugging
purposes or if we want to integrate with a build system instead.
- classpath will be changed in the final CL to refer to the external
ASM lib rather than the project. I need the source for debugging
rigth now.
- will review comments before submitting.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146498
This is only a preliminary CL. More will follow but this is
a good start, with the following caveats:
What it does:
- take an input jar, a list of includes, a list of excludes.
- generate actual Java source for the filtered classes.
What it doesn't do yet:
- some more work on filtering inner elements (methods, etc.)
- properly generate inner classes.
- hide synthetic fields.
- some classes body are missing
- directly generate a stubbed bytecode/jar rather than source.
I'll likely want to keep the source generator for debugging
purposes or if we want to integrate with a build system instead.
- classpath will be changed in the final CL to refer to the external
ASM lib rather than the project. I need the source for debugging
rigth now.
- will review comments before submitting.
Original author: raphael
Merged from: //branches/cupcake/...
Automated import of CL 145983
- rename the directory and zip file
- make it build to the dist directory
Original author: joeo
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146003
This is only a preliminary CL. More will follow but this is
a good start, with the following caveats:
What it does:
- take an input jar, a list of includes, a list of excludes.
- generate actual Java source for the filtered classes.
What it doesn't do yet:
- some more work on filtering inner elements (methods, etc.)
- properly generate inner classes.
- hide synthetic fields.
- some classes body are missing
- directly generate a stubbed bytecode/jar rather than source.
I'll likely want to keep the source generator for debugging
purposes or if we want to integrate with a build system instead.
- classpath will be changed in the final CL to refer to the external
ASM lib rather than the project. I need the source for debugging
rigth now.
- will review comments before submitting.
BUG=1778786
Automated import of CL 145911
Use a different name for prebuilt libraries based on their LOCAL_MODULE --
they were all colliding using the same name, javalib.jar. These names
are synthetic, since the libraries don't actually exist on the device
as such.
