GitLab

Change-Id: I7b5cecd4236f263c31d4af73d929ff6b5729089e

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

Merge commit 'bce4b75f' into gingerbread

* commit 'bce4b75f':
  Add JNI_H_INCLUDE as default header search path

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

am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo

Merge commit 'd5c217ac' into gingerbread

* commit 'd5c217ac':
  add phony target "all_modules" and use it as make goal for "mm"/"mmm"

Merge commit '75b28573' into gingerbread

* commit '75b28573':
  Fix sim build for unbundling native code

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

NDK does not support sim build.

Change-Id: I57a09c0083126c57a99cf33c055edef3390d1c28

Change-Id: I8f8ec00667374cd1f5adad6ea4d737dac79be47f

Merge commit '9269a711' into gingerbread

* commit '9269a711':
  docs: ensure code-ified links in qv are the proper color

Change-Id: I61dd859e0749573746c9bfcbf224758463370ba7

Merge "Instrumentation links against the jar file for its app, so use that at the dependency." into gingerbread

Merge "Fix event-log-tags so we don't rebuild framework.jar because of an installclean." into gingerbread

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 'a0cb4666' into gingerbread

* commit 'a0cb4666':
  Build Accessibility Tests and APK

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

libgui is for high level C++ frameworks, it can depend on the
binder (unlike libui).

Change-Id: I4a1ebc69284919c85dce03e1395578af2fd08aa8

Change-Id: I79accedc16d6e62a95c0ec6f08ad2538013cd0b3

Change-Id: Ic9efcc70af22f15a1bb136f70a30db59dc629e03

Merge commit 'b6a1c180' into gingerbread

* commit 'b6a1c180':
  Keep the crt start/end var name of sh consistent with other archs

So that the PRIVATE_ vars get values correctly.

Change-Id: I1eea67f02c5bab5018b3b5fd93904e1ee8643bf7

Change-Id: I9e4183a1d5c0efb13de8655b9eb7c74d50b34cd7

Bug: http://b/issue?id=2811253
Change-Id: Iabd4ab8b3d7236dffe89f1939e1142e882944026

Change-Id: I2759c464efef13754154310d10816a5781243311

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 'b66a5c05' into gingerbread

* commit 'b66a5c05':
  docs: modify redirect link text

Change-Id: Ieb26c4278958624b9c7aa8795cd7a8cab87fafec

We will only support 64-bit build environment from now on.

Change-Id: Ic58cb3e06e7fc9cf19a65e6c05c26f12ff9886b7

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

that is only used to put your library into the dist dir when doing a full build.

Change-Id: I11e9dc15237086843ea4a00736c81ffc680ca12e

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

Add ramdisk.img to the dist dir, again (was removed at some point) - from master - please do no merge
b/2590492 and requested again

Change-Id: I1f4efac2a8ca47f1b69761bb9233427e0ca0411d

Merge commit '783f449b' into gingerbread

* commit '783f449b':
  Don't copy apns-conf.xml for apps-only build