Jeff Gaston c5fa0e7f49 resolve merge conflicts of 8bbbd87ef6 to stage-aosp-master ...

Test: I solemnly swear I tested this conflict resolution.
Merged-In: Id2d18fe41de5d533baf1f082292d70d946386249
Change-Id: Ibc66733eb7879f2be2458e922641fec3a899beab

2017-09-15 19:25:19 +00:00

..

check_boot_jars

Update whitelisted package name for google vr

2017-05-11 01:54:14 -07:00

tools

Support signing custom_images with AVB

2017-08-25 13:28:57 +08:00

apicheck.mk

Add new Test API for CTS testing.

2015-11-25 11:38:44 +00:00

boot_jars_package_check.mk

Conditionally skip boot jars package name check.

2014-09-11 17:40:29 -07:00

build_custom_images.mk

custom_images: support verity fec (forward error correction)

2017-07-14 21:47:13 +08:00

collect_gpl_sources.mk

collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE

2014-01-27 12:25:43 -08:00

cts.mk

old-cts: Add testng and libcoreoj test support

2016-04-26 17:00:22 -07:00

deps_licenses.mk

Add task to print transitive dependencies and their license files.

2015-05-19 16:37:42 -07:00

device-tests.mk

Fix test suite zip generation on mac

2017-08-01 01:51:30 +00:00

general-tests.mk

Fix test suite zip generation on mac

2017-08-01 01:51:30 +00:00

ide.mk

Make make ECLIPSE-lunch build a .classpath for all the java stuff that will be included in the

2010-05-26 17:58:21 -04:00

module-info.mk

Add generation of a module-info.json file

2016-04-06 19:11:51 -07:00

oem_image.mk

oem_image/custom_image: fix missing new parameter to build_image.py

2015-07-13 14:46:49 -07:00

sdk-addon.mk

resolve merge conflicts of 8bbbd87ef6 to stage-aosp-master

2017-09-15 19:25:19 +00:00

vendor_module_check.mk

Merge \\\"Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES\\\" am: 2acb2d5bcf am: 200da242a5

2016-06-28 06:27:13 +00:00