diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-07-23 03:04:48 +0200 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-07-23 03:04:48 +0200 |
| commit | 8e8baa74c467a51dcf1338d3096875f5a0baf868 (patch) | |
| tree | a2bb25cd987bd47e79f0bc2399f6dd46b42acffc /libs3cjpeg | |
| parent | 55709d40c8df61c6badb8a8ecab6ebfd34b95d60 (diff) | |
| parent | b5f4a69e24cd5dae6c2d014b078c3a2966d14611 (diff) | |
| download | device_samsung_crespo-8e8baa74c467a51dcf1338d3096875f5a0baf868.zip device_samsung_crespo-8e8baa74c467a51dcf1338d3096875f5a0baf868.tar.gz device_samsung_crespo-8e8baa74c467a51dcf1338d3096875f5a0baf868.tar.bz2 | |
Merge remote-tracking branch 'github/ics' into 23072012
Conflicts:
Android.mk
BoardConfigCommon.mk
board-info.txt
device_base.mk
egl.cfg
factory-images/generate-factory-images-package.sh
kernel
overlay/frameworks/base/core/res/res/values/config.xml
Change-Id: If153de549a1a3b5145f856de6c55c825d3124a11
Diffstat (limited to 'libs3cjpeg')
| -rw-r--r-- | libs3cjpeg/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs3cjpeg/Android.mk b/libs3cjpeg/Android.mk index af1f88e..086e7aa 100644 --- a/libs3cjpeg/Android.mk +++ b/libs3cjpeg/Android.mk @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ifeq ($(filter-out s5pc110,$(TARGET_BOARD_PLATFORM)),) +ifneq ($(filter crespo crespo4g,$(TARGET_DEVICE)),) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) |