diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-01-23 09:20:14 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-23 09:20:14 -0800 |
commit | 77ba40c5bbdda3f7c8ab262798756c37ef1981fe (patch) | |
tree | 52cb4e48933deb5b7b05b437de3815b81fa9e4a5 | |
parent | 1218796776b2fa123681d8edb0a1f4b4fc9e2cbc (diff) | |
parent | 712695795d1a3978319b5d7bac15ecbaee32799c (diff) | |
download | device_samsung_maguro-77ba40c5bbdda3f7c8ab262798756c37ef1981fe.zip device_samsung_maguro-77ba40c5bbdda3f7c8ab262798756c37ef1981fe.tar.gz device_samsung_maguro-77ba40c5bbdda3f7c8ab262798756c37ef1981fe.tar.bz2 |
Merge "pvrsrvinit -> pvrsrvctl"
-rwxr-xr-x | self-extractors/generate-packages.sh | 2 | ||||
-rw-r--r-- | self-extractors/imgtec/staging/device-partial.mk | 2 | ||||
-rw-r--r-- | self-extractors/imgtec/staging/proprietary/Android.mk | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh index 4e89f6d..5ba2ad6 100755 --- a/self-extractors/generate-packages.sh +++ b/self-extractors/generate-packages.sh @@ -51,7 +51,7 @@ do ;; imgtec) TO_EXTRACT="\ - system/vendor/bin/pvrsrvinit \ + system/vendor/bin/pvrsrvctl \ system/vendor/lib/egl/libEGL_POWERVR_SGX540_120.so \ system/vendor/lib/egl/libGLESv1_CM_POWERVR_SGX540_120.so \ system/vendor/lib/egl/libGLESv2_POWERVR_SGX540_120.so \ diff --git a/self-extractors/imgtec/staging/device-partial.mk b/self-extractors/imgtec/staging/device-partial.mk index fd51db8..5dfa0b9 100644 --- a/self-extractors/imgtec/staging/device-partial.mk +++ b/self-extractors/imgtec/staging/device-partial.mk @@ -14,7 +14,7 @@ # Imgtec blob(s) necessary for Maguro hardware PRODUCT_PACKAGES := \ - pvrsrvinit \ + pvrsrvctl \ libEGL_POWERVR_SGX540_120 \ libGLESv1_CM_POWERVR_SGX540_120 \ libGLESv2_POWERVR_SGX540_120 \ diff --git a/self-extractors/imgtec/staging/proprietary/Android.mk b/self-extractors/imgtec/staging/proprietary/Android.mk index 68ba039..2d69bf3 100644 --- a/self-extractors/imgtec/staging/proprietary/Android.mk +++ b/self-extractors/imgtec/staging/proprietary/Android.mk @@ -17,9 +17,9 @@ LOCAL_PATH := $(call my-dir) ifeq ($(TARGET_DEVICE),maguro) include $(CLEAR_VARS) -LOCAL_MODULE := pvrsrvinit +LOCAL_MODULE := pvrsrvctl LOCAL_MODULE_OWNER := imgtec -LOCAL_SRC_FILES := pvrsrvinit +LOCAL_SRC_FILES := pvrsrvctl LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/bin |