diff options
| author | Ying Wang <wangying@google.com> | 2015-02-04 11:28:56 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-02-04 11:28:56 -0800 |
| commit | 16ba2ed82bc084d5355477a381cc0bcc8b60a7bd (patch) | |
| tree | 742bfd2bf13d8b399bfdd78fd684213dd19768ca /core/main.mk | |
| parent | e9bc7b472db2d54aaef428fc3229b56dbe2bf6fa (diff) | |
| parent | 4c178ebcc0069b6f806de4df491bc9a7e1b9d78e (diff) | |
| download | build-16ba2ed82bc084d5355477a381cc0bcc8b60a7bd.zip build-16ba2ed82bc084d5355477a381cc0bcc8b60a7bd.tar.gz build-16ba2ed82bc084d5355477a381cc0bcc8b60a7bd.tar.bz2 | |
resolved conflicts for merge of 4c178ebc to lmp-mr1-dev-plus-aosp
Change-Id: If84527e9333b855d406dc7ac317868f4cfd3f1f2
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 3400f55..981ecef 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) @@ -955,8 +949,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. |