diff options
| author | Ying Wang <wangying@google.com> | 2015-02-04 19:33:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-04 19:33:14 +0000 |
| commit | 3e9b20e4309edb0162d120aecf6a4021c8d1b2d6 (patch) | |
| tree | 97efd388085a44b8e07d0ad41859e1dca33a0e2f /core/main.mk | |
| parent | f65bde3e7819b88f6c52613c48db274a5b7f67bd (diff) | |
| parent | 16ba2ed82bc084d5355477a381cc0bcc8b60a7bd (diff) | |
| download | build-3e9b20e4309edb0162d120aecf6a4021c8d1b2d6.zip build-3e9b20e4309edb0162d120aecf6a4021c8d1b2d6.tar.gz build-3e9b20e4309edb0162d120aecf6a4021c8d1b2d6.tar.bz2 | |
am 16ba2ed8: resolved conflicts for merge of 4c178ebc to lmp-mr1-dev-plus-aosp
* commit '16ba2ed82bc084d5355477a381cc0bcc8b60a7bd':
Remove support of factory ramdisk/bundle.
Diffstat (limited to 'core/main.mk')
| -rw-r--r-- | core/main.mk | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/core/main.mk b/core/main.mk index 50b48e0..d23c762 100644 --- a/core/main.mk +++ b/core/main.mk @@ -840,12 +840,6 @@ endif .PHONY: ramdisk ramdisk: $(INSTALLED_RAMDISK_TARGET) -.PHONY: factory_ramdisk -factory_ramdisk: $(INSTALLED_FACTORY_RAMDISK_TARGET) - -.PHONY: factory_bundle -factory_bundle: $(INSTALLED_FACTORY_BUNDLE_TARGET) - .PHONY: systemtarball systemtarball: $(INSTALLED_SYSTEMTARBALL_TARGET) @@ -957,8 +951,6 @@ else # TARGET_BUILD_APPS $(BUILT_TARGET_FILES_PACKAGE) \ $(INSTALLED_ANDROID_INFO_TXT_TARGET) \ $(INSTALLED_RAMDISK_TARGET) \ - $(INSTALLED_FACTORY_RAMDISK_TARGET) \ - $(INSTALLED_FACTORY_BUNDLE_TARGET) \ ) # Put a copy of the radio/bootloader files in the dist dir. |