GitLab

Change-Id: If691e263f157aa0d123c0e3fe3c9698bbbf58c96

Merge commit '4e8e998e'

* commit '4e8e998e':
  Include Test Case List from CTS Project

Merge commit '989fade3' into gingerbread-plus-aosp

* commit '989fade3':
  Include Test Case List from CTS Project

Merge commit 'af44485f' into gingerbread

* commit 'af44485f':
  Include Test Case List from CTS Project

Change-Id: I6bac03b1f646ea171ee20f0e90d37f337d7987fa

Merge commit '606540b7'

* commit '606540b7':
  Packages can specify where to find AndroidManifest.xml

Change-Id: I67b9af3ef344cfa7502f780d82c1a3d8a1a33f6d

Change-Id: I7b5cecd4236f263c31d4af73d929ff6b5729089e

Merge commit '44d62854'

* commit '44d62854':
  Replaced AlarmClock with DeskClock

Merge commit '8339ba91' into gingerbread-plus-aosp

* commit '8339ba91':
  Replaced AlarmClock with DeskClock

Change-Id: I1a9b9ce79b5b16709fe2d89638285633801b6d24

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

Change-Id: I84eb98c0b3fdaeb9e06c934ea5f4bdcf078cb7f1

Merge commit '3986feae'

* commit '3986feae':
  Add JNI_H_INCLUDE as default header search path

Merge commit 'ef5bf469' into gingerbread-plus-aosp

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

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

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 '85581a1b'

* commit '85581a1b':
  Allow explicit warnings for projects

Change-Id: Ide7fbe06d7f9c1a06827365f006ddc7a01ba4dab

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

Merge commit 'b96e8a8c'

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

Merge commit '163ce0f6'

* commit '163ce0f6':
  Fix sim build for unbundling native code

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

Merge commit 'd9dea715' into gingerbread-plus-aosp

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

Merge commit 'ebf93bb5' into gingerbread-plus-aosp

* commit 'ebf93bb5':
  Fix sim build for unbundling native code

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

Change-Id: I2ef5a4c913732a9a3211556493926f4883b4160e

Change-Id: Ic3c592ca9457748acf7f2c5e99dccd3ed62f5ee4

With the CL, "include $(BUILD_NATIVE_TEST)" to build native test;
"include $(BUILD_HOST_NATIVE_TEST)" to build a host native test.

Change-Id: Icdbbcf906cd4c5c35e65962897490052cd051102

Change-Id: I5147d687750a50cfc186e99a9a8c88d3b2eb1692
If PRODUCT_PROPERTY_OVERRIDES has set default locale, buildinfo.sh skips setting them.
http://b/issue?id=2243115

Change-Id: I1a868885e72c94c4b065723a8d6e890fce5ba1e0
http://b/issue?id=1444634

http://b/issue?id=1505957
Before this change, if tools.jar can not be found, make reports error like:
make: *** No rule to make target `Please-install-JDK-5.0,-update-12-or-higher,-which-you-can-download-from-java.sun.com'...
With this change, the error message is much nicer:
build/core/config.mk:264: *** Error: could not find jdk tools.jar, please install JDK-5.0, update 12 or higher, which you can download from java.sun.com.  Stop.

Change-Id: Id33cfb6ee7676d66f00d0a41d07c1f27abc6a402

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

With this change, you can add your .rs files to LOCAL_SRC_FILES.
The .rs files will be compiled by slang and the output .java files
will be compiled into the jar, while the generated .bc files will
be put into the final apk as raw resources.

Change-Id: Icde3d6139951d6d039b4b37376e72e1fc5c8b0d4