Merge commit 'ddeb150d8d300806de576430444bf1a84ff35e96' into gingerbread-plus-aosp
* commit 'ddeb150d8d300806de576430444bf1a84ff35e96':
Add easymock for list of Windows SDK targets.
Merge commit '43d406e5c633af505de0e05e44fda9cfe781c184' into gingerbread-plus-aosp
* commit '43d406e5c633af505de0e05e44fda9cfe781c184':
add drm/ directory to include it as part of frameworks
Merge commit 'ddefdef5bc560d95f799993759c22ddc02e61b49' into gingerbread-plus-aosp
* commit 'ddefdef5bc560d95f799993759c22ddc02e61b49':
Make ProGuard keep necessary members for serializable classes
Merge commit '1a2649f0da35218748db5aa02c9969246a714b8f' into gingerbread-plus-aosp
* commit '1a2649f0da35218748db5aa02c9969246a714b8f':
Add voip(SIP related codes) into framework.
Merge commit '7dc35a3b9c7fe7e6aaacc8e11dca9ca94f4b4ff0' into gingerbread-plus-aosp
* commit '7dc35a3b9c7fe7e6aaacc8e11dca9ca94f4b4ff0':
Tracking merge of dalvik-dev to gingerbread
Merge commit '989fade304ef5253b5b401f347e26f768d75f35f' into gingerbread-plus-aosp
* commit '989fade304ef5253b5b401f347e26f768d75f35f':
Include Test Case List from CTS Project
Merge commit 'af44485fe83bb36a9d55fb54a8f5362854dd7b10' into gingerbread
* commit 'af44485fe83bb36a9d55fb54a8f5362854dd7b10':
Include Test Case List from CTS Project
By overriding LOCAL_MANIFEST_FILE, a package can now specify which
AndroidManifest.xml file to use. This also allows for AndroidManifest.xml to
be in a non-standard location, though that's not recommended.
Change-Id: Ib6d1baeef7601e5a93d4ce64d18883d45373fc12
So that module Android.mk does not need to include it manually.
Also with this change, CL like https://android-git.corp.google.com/g/57887 is not needed.
Change-Id: I68fa73a00c76eb37a8142f35d7eeef79cf53c09b
Bug 2732160
Have the cts.mk include the test case list from CTS rather
than defining it in cts.mk. This permits CTS developers to
add new packages and applications without having to submit
multiple project changes to both the CTS and build projects
everytime.
Change-Id: I63d90ac4f5d9fc9a9aa0ff79a8bf9dfb1a79c822
Merge commit 'd9dea715e5841028b1a30aa3f357b05c9de3e8c7' into gingerbread-plus-aosp
* commit 'd9dea715e5841028b1a30aa3f357b05c9de3e8c7':
add phony target "all_modules" and use it as make goal for "mm"/"mmm"
Merge commit 'd5c217aca18726f0ed9f2ea034f750620d4bdf7d' into gingerbread
* commit 'd5c217aca18726f0ed9f2ea034f750620d4bdf7d':
add phony target "all_modules" and use it as make goal for "mm"/"mmm"
So that mm/mmm don't depend on phony target "files", which brings in
unwanted files for apps-only build.
Also allow "dist" for mmm.
Bug: http://b/issue?id=2811503
Change-Id: I2c0794aebd1d171d8a0f44eb8cda67855704d6bd
Enabled compiler warnings by default and then modified javac
command to include warnings only if a project's warning flag,
LOCAL_WARNINGS_ENABLE, is set to true.
Change-Id: I5111d16a862f3afaaf1dcba2f2c2b7fc072613f1
Merge commit 'b1c272a670936322db5200d888ea8558eb266d6e' into gingerbread-plus-aosp
* commit 'b1c272a670936322db5200d888ea8558eb266d6e':
Do a full clean build because of the installclean improvement steps
Merge commit 'e2c622524116b49d5817fedf1d88e2bb1521a9ec' into gingerbread-plus-aosp
* commit 'e2c622524116b49d5817fedf1d88e2bb1521a9ec':
Instrumentation links against the jar file for its app, so use that at the dependency.
Merge commit 'd7324cc356e9c67d878d156ca81928ab2ef220f5' into gingerbread-plus-aosp
* commit 'd7324cc356e9c67d878d156ca81928ab2ef220f5':
Fix event-log-tags so we don't rebuild framework.jar because of an installclean.
Merge commit '2198ff81b98941e905f7e39616f5ca15effb5704' into gingerbread-plus-aosp
* commit '2198ff81b98941e905f7e39616f5ca15effb5704':
The ICU data is no longer compiled directly into the shared library.
I don't remember exactly, but I think the dependencies for apps
were broken, and you couldn't reliably cause the java to be rebuilt
by depending just on the jar file-- you needed to depend on the
apk. That isn't the case anymore, and relying on the apk means
that something built in out/target/common was depending on something
that's deleted by installclean.
With this change (and others), on my mac, the build after
installclean for passion-eng takes 2 minutes instead of 11.
Change-Id: Ib490f88292d591254013e07958961fc50ec2e3dc
Merge commit '9967e9dbb82e982db67fcfc5412055f26b8721b4' into gingerbread-plus-aosp
* commit '9967e9dbb82e982db67fcfc5412055f26b8721b4':
add an entry for the new libgui
Produce an event logs tag file for everything we know about, in order
to properly allocate numbers. Then produce a file that's filtered
for what's going to be installed.
Change-Id: Id0778aec0b4d045e8ff91ba2c9c8265e860eaba5
Merge commit '90b1d3dcfece8eef53277cbcf0326deda9f16f09' into gingerbread-plus-aosp
* commit '90b1d3dcfece8eef53277cbcf0326deda9f16f09':
Keep the crt start/end var name of sh consistent with other archs
Merge commit 'b6a1c1802961f40fe4736e80402f849968cd2563' into gingerbread
* commit 'b6a1c1802961f40fe4736e80402f849968cd2563':
Keep the crt start/end var name of sh consistent with other archs
Merge commit 'f0f60cdd8f4f74b2480774887606afdebec8d891' into gingerbread-plus-aosp
* commit 'f0f60cdd8f4f74b2480774887606afdebec8d891':
Support to build native libraries with prebuilt NDK
These variables are useless for non-arm platforms, and will
generate misleading messages during building process.
Change-Id: I37c46ac8d30f353333803d9591b65fca24ce3fd5
Bug 2814482
Froyo's cts.mk was missing two lines added to Eclair's cts.mk that
are needed to build the accessibility tests and apk.
Change-Id: I05f93bc0a56b2ec1e07eab8c7a15ef7d4bb90d18
Merge commit 'de6a08576487b949180c1b0ed1c19e9f7f4ef787' into gingerbread-plus-aosp
* commit 'de6a08576487b949180c1b0ed1c19e9f7f4ef787':
Fix broken interaction of JarJar and Emma.
JarJar, like DX, can't handle the local var corruption that Emma
performs. To fix this, I'm moving the JarJar step before the Emma
step.
Couple other minor changes:
* Improved the comment about emma hardcoding its output filename,
since this took me about an hour to track down.
* Changed one line from "Copying $<" to "Copying $@". It seems to be
the convention that such lines print the destination, not the
source, so I made it consistent.
Change-Id: I9f5c36b4f5af15daf15025b89860e942f15bb668
If $(TARGET_DEVICE_DIR)/system.prop exists, it should be
a prerequisite of $(INSTALLED_BUILD_PROP_TARGET),
as the following rules state.
Change-Id: Ie395b6f08cef198c3f5c733a5b6ae5a458335a9c
Merge commit '750ac4f3a43dfbb66e45517ce2502858daeab1a9' into gingerbread-plus-aosp
* commit '750ac4f3a43dfbb66e45517ce2502858daeab1a9':
Manual merge of change 50994 from master (DO NOT MERGE)
Merging from master because I'm bringing my maps API work into
gingerbread.
Fix and enable JarJar in Java builds.
java.mk contained a target to enable JarJar in Java builds, but it was
being bypassed. This change enabled JarJar as part of the build
process, and fixes a slight bug with the way it was set up.
Change-Id: I814e64eb30b41bf249a63d683c03040e2658fe0d
Merge commit '7d735133cd6f019ce839fa824f4507f19aff2e8f' into gingerbread-plus-aosp
* commit '7d735133cd6f019ce839fa824f4507f19aff2e8f':
Add ramdisk.img to the dist dir, again (was removed at some point) - from master - please do no merge
http://b/issue?id=2796939
This can fix commands mm and mmm in an unbundled branch.
The cause is that mm & mmm depends on phony target "files", which includes apns-conf.xml.
Change-Id: I72ce1c7c5ddfdcd3bbea5cb9645ca3a48ff8ac12
