Don't like ads? PRO users don't see any ads ;-)
Public Pastes
Guest

Untitled

By: a guest on Jul 15th, 2012  |  syntax: None  |  size: 22.60 KB  |  hits: 37  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1.  
  2. project build/
  3. diff --git a/core/user_tags.mk b/core/user_tags.mk
  4. index 4beb54a..3ea355b 100644
  5. --- a/core/user_tags.mk
  6. +++ b/core/user_tags.mk
  7. @@ -495,4 +495,11 @@ GRANDFATHERED_USER_MODULES += \
  8.         wdsclient \
  9.         wpa_supplicant \
  10.         yuv420sp2rgb \
  11. -       zipalign
  12. +       zipalign \
  13. +        libOmxCore \
  14. +        libOmxVenc \
  15. +        libOmxVdec \
  16. +        libmm-omxcore \
  17. +        lights.msm7x30 \
  18. +        gralloc.msm7x30 \
  19. +        gps.spade
  20.  
  21. project device/htc/ace/
  22. diff --git a/BoardConfig.mk b/BoardConfig.mk
  23. index e9522d0..8772618 100644
  24. --- a/BoardConfig.mk
  25. +++ b/BoardConfig.mk
  26. @@ -32,6 +32,8 @@ USE_CAMERA_STUB := true
  27.  -include vendor/htc/ace/BoardConfigVendor.mk
  28.  
  29.  TARGET_BOOTLOADER_BOARD_NAME := spade
  30. +TARGET_KERNEL_SOURCE := kernel/htc/msm7x30
  31. +TARGET_KERNEL_CONFIG := cyanogen_msm7230_defconfig
  32.  
  33.  BOARD_KERNEL_CMDLINE := no_console_suspend=1
  34.  BOARD_KERNEL_RECOVERY_CMDLINE := $(BOARD_KERNEL_CMDLINE) msmsdcc_power_gpio=88
  35. @@ -61,7 +63,7 @@ BOARD_BOOTIMAGE_PARTITION_SIZE := 4194304
  36.  BOARD_FLASH_BLOCK_SIZE := 262144
  37.  
  38.  TARGET_RELEASETOOLS_EXTENSIONS := device/htc/common
  39. -TARGET_PREBUILT_KERNEL := device/htc/msm7x30-common/msm7230/kernel
  40. +# TARGET_PREBUILT_KERNEL := device/htc/msm7x30-common/msm7230/kernel
  41.  
  42.  BOARD_HAS_NO_SELECT_BUTTON := true
  43.  BOARD_SDCARD_DEVICE_PRIMARY := /dev/block/mmcblk1p1
  44. diff --git a/device.mk b/device.mk
  45. index 0c24bad..df45878 100644
  46. --- a/device.mk
  47. +++ b/device.mk
  48. @@ -191,6 +191,6 @@ $(call inherit-product, device/htc/msm7x30-common/msm7x30.mk)
  49.  # htc audio settings
  50.  $(call inherit-product, device/htc/ace/media_htcaudio.mk)
  51.  
  52. -$(call inherit-product, frameworks/base/build/phone-hdpi-512-dalvik-heap.mk)
  53. +$(call inherit-product, frameworks/native/build/phone-hdpi-512-dalvik-heap.mk)
  54.  
  55.  $(call inherit-product-if-exists, vendor/htc/ace/device-vendor.mk)
  56. diff --git a/liblights/lights.c b/liblights/lights.c
  57. index 960a2bb..55eec8d 100644
  58. --- a/liblights/lights.c
  59. +++ b/liblights/lights.c
  60. @@ -65,7 +65,7 @@ static int write_int (const char* path, int value) {
  61.         fd = open(path, O_RDWR);
  62.         if (fd < 0) {
  63.                 if (already_warned == 0) {
  64. -                       LOGE("write_int failed to open %s\n", path);
  65. +                       ALOGE("write_int failed to open %s\n", path);
  66.                         already_warned = 1;
  67.                 }
  68.                 return -errno;
  69. @@ -128,7 +128,7 @@ static void set_speaker_light_locked (struct light_device_t *dev, struct light_s
  70.                                         write_int (BLUE_LED_FILE, 0);
  71.                                         break;
  72.                                 default:
  73. -                                       LOGE("set_led_state colorRGB=%08X, unknown color\n",
  74. +                                       ALOGE("set_led_state colorRGB=%08X, unknown color\n",
  75.                                                         colorRGB);
  76.                                         break;
  77.                         }
  78. @@ -159,7 +159,7 @@ static void set_speaker_light_locked (struct light_device_t *dev, struct light_s
  79.                         }
  80.                         break;
  81.                 default:
  82. -                       LOGE("set_led_state colorRGB=%08X, unknown mode %d\n",
  83. +                       ALOGE("set_led_state colorRGB=%08X, unknown mode %d\n",
  84.                                         colorRGB, state->flashMode);
  85.         }
  86.  
  87. @@ -182,7 +182,7 @@ static void set_speaker_light_locked_dual (struct light_device_t *dev, struct li
  88.                 write_int (AMBER_BLINK_FILE, 1);
  89.                 write_int (BLUE_LED_FILE, 0);
  90.         } else {
  91. -               LOGE("set_led_state (dual) unexpected color: bcolorRGB=%08x\n", bcolorRGB);
  92. +               ALOGE("set_led_state (dual) unexpected color: bcolorRGB=%08x\n", bcolorRGB);
  93.         }
  94.  
  95.  }
  96. @@ -220,7 +220,7 @@ static int set_light_backlight(struct light_device_t* dev,
  97.                 struct light_state_t const* state) {
  98.         int err = 0;
  99.         int brightness = rgb_to_brightness(state);
  100. -       LOGV("%s brightness=%d color=0x%08x",
  101. +       ALOGV("%s brightness=%d color=0x%08x",
  102.                 __func__,brightness, state->color);
  103.         pthread_mutex_lock(&g_lock);
  104.         g_backlight = brightness;
  105. diff --git a/libsensors/AkmSensor.cpp b/libsensors/AkmSensor.cpp
  106. index 0757403..3712aa3 100644
  107. --- a/libsensors/AkmSensor.cpp
  108. +++ b/libsensors/AkmSensor.cpp
  109. @@ -148,7 +148,7 @@ int AkmSensor::enable(int32_t handle, int en)
  110.          short flags = newState;
  111.          err = ioctl(dev_fd, cmd, &flags);
  112.          err = err<0 ? -errno : 0;
  113. -        LOGE_IF(err, "ECS_IOCTL_APP_SET_XXX failed (%s)", strerror(-err));
  114. +        ALOGE_IF(err, "ECS_IOCTL_APP_SET_XXX failed (%s)", strerror(-err));
  115.          if (!err) {
  116.              mEnabled &= ~(1<<what);
  117.              mEnabled |= (uint32_t(flags)<<what);
  118. @@ -236,7 +236,7 @@ int AkmSensor::readEvents(sensors_event_t* data, int count)
  119.                  mInputReader.next();
  120.              }
  121.          } else {
  122. -            LOGE("AkmSensor: unknown event (type=%d, code=%d)",
  123. +            ALOGE("AkmSensor: unknown event (type=%d, code=%d)",
  124.                      type, event->code);
  125.              mInputReader.next();
  126.          }
  127. diff --git a/libsensors/LightSensor.cpp b/libsensors/LightSensor.cpp
  128. index e3aac2c..0be9a90 100644
  129. --- a/libsensors/LightSensor.cpp
  130. +++ b/libsensors/LightSensor.cpp
  131. @@ -77,7 +77,7 @@ int LightSensor::enable(int32_t, int en) {
  132.          }
  133.          err = ioctl(dev_fd, LIGHTSENSOR_IOCTL_ENABLE, &flags);
  134.          err = err<0 ? -errno : 0;
  135. -        LOGE_IF(err, "LIGHTSENSOR_IOCTL_ENABLE failed (%s)", strerror(-err));
  136. +        ALOGE_IF(err, "LIGHTSENSOR_IOCTL_ENABLE failed (%s)", strerror(-err));
  137.          if (!err) {
  138.              mEnabled = en ? 1 : 0;
  139.              if (en) {
  140. @@ -131,7 +131,7 @@ int LightSensor::readEvents(sensors_event_t* data, int count)
  141.                  numEventReceived++;
  142.              }
  143.          } else {
  144. -            LOGE("LightSensor: unknown event (type=%d, code=%d)",
  145. +            ALOGE("LightSensor: unknown event (type=%d, code=%d)",
  146.                      type, event->code);
  147.          }
  148.          mInputReader.next();
  149. diff --git a/libsensors/ProximitySensor.cpp b/libsensors/ProximitySensor.cpp
  150. index abd8e6b..a97d73a 100644
  151. --- a/libsensors/ProximitySensor.cpp
  152. +++ b/libsensors/ProximitySensor.cpp
  153. @@ -78,7 +78,7 @@ int ProximitySensor::enable(int32_t, int en) {
  154.          int flags = newState;
  155.          err = ioctl(dev_fd, CAPELLA_CM3602_IOCTL_ENABLE, &flags);
  156.          err = err<0 ? -errno : 0;
  157. -        LOGE_IF(err, "CAPELLA_CM3602_IOCTL_ENABLE failed (%s)", strerror(-err));
  158. +        ALOGE_IF(err, "CAPELLA_CM3602_IOCTL_ENABLE failed (%s)", strerror(-err));
  159.          if (!err) {
  160.              mEnabled = newState;
  161.              if (en) {
  162. @@ -129,7 +129,7 @@ int ProximitySensor::readEvents(sensors_event_t* data, int count)
  163.                  numEventReceived++;
  164.              }
  165.          } else {
  166. -            LOGE("ProximitySensor: unknown event (type=%d, code=%d)",
  167. +            ALOGE("ProximitySensor: unknown event (type=%d, code=%d)",
  168.                      type, event->code);
  169.          }
  170.          mInputReader.next();
  171. diff --git a/libsensors/SensorBase.cpp b/libsensors/SensorBase.cpp
  172. index e0554e4..0bd2ba7 100644
  173. --- a/libsensors/SensorBase.cpp
  174. +++ b/libsensors/SensorBase.cpp
  175. @@ -51,7 +51,7 @@ SensorBase::~SensorBase() {
  176.  int SensorBase::open_device() {
  177.      if (dev_fd<0 && dev_name) {
  178.          dev_fd = open(dev_name, O_RDONLY);
  179. -        LOGE_IF(dev_fd<0, "Couldn't open %s (%s)", dev_name, strerror(errno));
  180. +        ALOGE_IF(dev_fd<0, "Couldn't open %s (%s)", dev_name, strerror(errno));
  181.      }
  182.      return 0;
  183.  }
  184. @@ -117,6 +117,6 @@ int SensorBase::openInput(const char* inputName) {
  185.          }
  186.      }
  187.      closedir(dir);
  188. -    LOGE_IF(fd<0, "couldn't find '%s' input device", inputName);
  189. +    ALOGE_IF(fd<0, "couldn't find '%s' input device", inputName);
  190.      return fd;
  191.  }
  192. diff --git a/libsensors/nusensors.cpp b/libsensors/nusensors.cpp
  193. index 248acc5..e78a9d3 100644
  194. --- a/libsensors/nusensors.cpp
  195. +++ b/libsensors/nusensors.cpp
  196. @@ -95,7 +95,7 @@ sensors_poll_context_t::sensors_poll_context_t()
  197.  
  198.      int wakeFds[2];
  199.      int result = pipe(wakeFds);
  200. -    LOGE_IF(result<0, "error creating wake pipe (%s)", strerror(errno));
  201. +    ALOGE_IF(result<0, "error creating wake pipe (%s)", strerror(errno));
  202.      fcntl(wakeFds[0], F_SETFL, O_NONBLOCK);
  203.      fcntl(wakeFds[1], F_SETFL, O_NONBLOCK);
  204.      mWritePipeFd = wakeFds[1];
  205. @@ -120,7 +120,7 @@ int sensors_poll_context_t::activate(int handle, int enabled) {
  206.      if (enabled && !err) {
  207.          const char wakeMessage(WAKE_MESSAGE);
  208.          int result = write(mWritePipeFd, &wakeMessage, 1);
  209. -        LOGE_IF(result<0, "error sending wake message (%s)", strerror(errno));
  210. +        ALOGE_IF(result<0, "error sending wake message (%s)", strerror(errno));
  211.      }
  212.      return err;
  213.  }
  214. @@ -159,14 +159,14 @@ int sensors_poll_context_t::pollEvents(sensors_event_t* data, int count)
  215.              // anything to return
  216.              n = poll(mPollFds, numFds, nbEvents ? 0 : -1);
  217.              if (n<0) {
  218. -                LOGE("poll() failed (%s)", strerror(errno));
  219. +                ALOGE("poll() failed (%s)", strerror(errno));
  220.                  return -errno;
  221.              }
  222.              if (mPollFds[wake].revents & POLLIN) {
  223.                  char msg;
  224.                  int result = read(mPollFds[wake].fd, &msg, 1);
  225. -                LOGE_IF(result<0, "error reading from wake pipe (%s)", strerror(errno));
  226. -                LOGE_IF(msg != WAKE_MESSAGE, "unknown message on wake queue (0x%02x)", int(msg));
  227. +                ALOGE_IF(result<0, "error reading from wake pipe (%s)", strerror(errno));
  228. +                ALOGE_IF(msg != WAKE_MESSAGE, "unknown message on wake queue (0x%02x)", int(msg));
  229.                  mPollFds[wake].revents = 0;
  230.              }
  231.          }
  232. diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
  233. index 43a9d65..02b3b95 100644
  234. --- a/overlay/frameworks/base/core/res/res/values/config.xml
  235. +++ b/overlay/frameworks/base/core/res/res/values/config.xml
  236. @@ -114,10 +114,10 @@
  237.      <integer name="config_defaultNotificationLedOff">9000</integer>
  238.  
  239.      <!-- Component name of the service providing network location support. -->
  240. -    <string name="config_networkLocationProvider">com.google.android.location.NetworkLocationProvider</string>
  241. +    <!-- <string name="config_networkLocationProvider">com.google.android.location.NetworkLocationProvider</string> -->
  242.  
  243.      <!-- Component name of the service providing geocoder API support. -->
  244. -    <string name="config_geocodeProvider">com.google.android.location.GeocodeProvider</string>
  245. +    <!-- <string name="config_geocodeProvider">com.google.android.location.GeocodeProvider</string> -->
  246.  
  247.      <!-- An Array of "[Connection name],[ConnectivityManager.TYPE_xxxx],
  248.           [associated radio-type],[priority],[restoral-timer(ms)],[dependencyMet]  -->
  249. diff --git a/overlay/packages/apps/Settings/res/values/config.xml b/overlay/packages/apps/Settings/res/values/config.xml
  250. index 241ad30..33d7c06 100644
  251. --- a/overlay/packages/apps/Settings/res/values/config.xml
  252. +++ b/overlay/packages/apps/Settings/res/values/config.xml
  253. @@ -16,7 +16,7 @@
  254.  
  255.  <resources>
  256.      <!-- LED Flashlight -->
  257. -    <bool name="has_led_flash">true</bool>
  258. +    <!-- <bool name="has_led_flash">true</bool> -->
  259.  
  260.      <!-- Whether or not the dock settings are to be displayed for this device when docked -->
  261.      <bool name="has_dock_settings">true</bool>
  262.  
  263. project device/htc/msm7x30-common/
  264. diff --git a/include/linux/android_pmem.h b/include/linux/android_pmem.h
  265. index c029196..35b3542 100644
  266. --- a/include/linux/android_pmem.h
  267. +++ b/include/linux/android_pmem.h
  268. @@ -51,6 +51,7 @@
  269.   * start of the mapped gpu regs (the vaddr returned by mmap) as the argument.
  270.   */
  271.  #define HW3D_REVOKE_GPU                _IOW(PMEM_IOCTL_MAGIC, 8, unsigned int)
  272. +#define PMEM_CACHE_FLUSH _IOW(PMEM_IOCTL_MAGIC, 8, unsigned int)
  273.  #define HW3D_GRANT_GPU         _IOW(PMEM_IOCTL_MAGIC, 9, unsigned int)
  274.  #define HW3D_WAIT_FOR_INTERRUPT        _IOW(PMEM_IOCTL_MAGIC, 10, unsigned int)
  275.  
  276. diff --git a/media_profiles.xml b/media_profiles.xml
  277. index 368c476..6972d41 100644
  278. --- a/media_profiles.xml
  279. +++ b/media_profiles.xml
  280. @@ -75,6 +75,7 @@
  281.  <!ATTLIST VideoEditorCap maxInputFrameHeight CDATA #REQUIRED>
  282.  <!ATTLIST VideoEditorCap maxOutputFrameWidth CDATA #REQUIRED>
  283.  <!ATTLIST VideoEditorCap maxOutputFrameHeight CDATA #REQUIRED>
  284. +<!ATTLIST VideoEditorCap maxPrefetchYUVFrames CDATA #REQUIRED>
  285.  <!ELEMENT ExportVideoProfile EMPTY>
  286.  <!ATTLIST ExportVideoProfile name (h264|h263|m4v) #REQUIRED>
  287.  <!ATTLIST ExportVideoProfile profile CDATA #REQUIRED>
  288. @@ -247,7 +248,7 @@
  289.      <AudioDecoderCap name="wma" enabled="false"/>
  290.      <VideoEditorCap  maxInputFrameWidth="1280"
  291.          maxInputFrameHeight="720" maxOutputFrameWidth="1280"
  292. -        maxOutputFrameHeight="720"/>
  293. +        maxOutputFrameHeight="720" maxPrefetchYUVFrames="6"/>
  294.      <!--
  295.          The VideoEditor Export codec profile and level values
  296.          correspond to the values in OMX_Video.h.
  297.  
  298. project frameworks/base/
  299. diff --git a/services/sensorservice/SensorDevice.cpp b/services/sensorservice/SensorDevice.cpp
  300. index 2244a86..6c9b63e 100644
  301. --- a/services/sensorservice/SensorDevice.cpp
  302. +++ b/services/sensorservice/SensorDevice.cpp
  303. @@ -102,6 +102,7 @@ SensorDevice::SensorDevice()
  304.      :  mSensorDevice(0),
  305.         mSensorModule(0)
  306.  {
  307. +    ALOGE("loading module %s ...", SENSORS_HARDWARE_MODULE_ID);
  308.      status_t err = hw_get_module(SENSORS_HARDWARE_MODULE_ID,
  309.              (hw_module_t const**)&mSensorModule);
  310.  
  311.  
  312. project hardware/libhardware/
  313. diff --git a/hardware.c b/hardware.c
  314. index 1f831cb..0714eb5 100644
  315. --- a/hardware.c
  316. +++ b/hardware.c
  317. @@ -24,6 +24,7 @@
  318.  #include <errno.h>
  319.  #include <limits.h>
  320.  
  321. +#define LOG_NDEBUG 0
  322.  #define LOG_TAG "HAL"
  323.  #include <utils/Log.h>
  324.  
  325. @@ -71,8 +72,10 @@ static int load(const char *id,
  326.       * dlopen returns. Since RTLD_GLOBAL is not or'd in with
  327.       * RTLD_NOW the external symbols will not be global
  328.       */
  329. +    ALOGE("load: before dlopen");
  330.      handle = dlopen(path, RTLD_NOW);
  331.      if (handle == NULL) {
  332. +        ALOGE("load: handle is null");
  333.          char const *err_str = dlerror();
  334.          ALOGE("load: module=%s\n%s", path, err_str?err_str:"unknown");
  335.          status = -EINVAL;
  336. @@ -81,6 +84,7 @@ static int load(const char *id,
  337.  
  338.      /* Get the address of the struct hal_module_info. */
  339.      const char *sym = HAL_MODULE_INFO_SYM_AS_STR;
  340. +    ALOGE("load: sym: %s", sym);
  341.      hmi = (struct hw_module_t *)dlsym(handle, sym);
  342.      if (hmi == NULL) {
  343.          ALOGE("load: couldn't find symbol %s", sym);
  344. @@ -88,19 +92,27 @@ static int load(const char *id,
  345.          goto done;
  346.      }
  347.  
  348. +    ALOGE("load: id: %s", id);
  349. +    ALOGE("load: hmi->id: %s", hmi->id);
  350. +
  351.      /* Check that the id matches */
  352. -    if (strcmp(id, hmi->id) != 0) {
  353. +    /* if (strcmp(id, hmi->id) != 0) {
  354.          ALOGE("load: id=%s != hmi->id=%s", id, hmi->id);
  355.          status = -EINVAL;
  356.          goto done;
  357. -    }
  358. +    } */
  359.  
  360. -    hmi->dso = handle;
  361. +    ALOGE("load: hmi->dso = handle;");    
  362. +    //hmi->dso = handle;
  363.  
  364. +    ALOGE("load: status = 0");
  365.      /* success */
  366.      status = 0;
  367.  
  368. +    ALOGE("load: done?");
  369. +
  370.      done:
  371. +    ALOGE("load: done: status: %i", status);
  372.      if (status != 0) {
  373.          hmi = NULL;
  374.          if (handle != NULL) {
  375. @@ -114,12 +126,14 @@ static int load(const char *id,
  376.  
  377.      *pHmi = hmi;
  378.  
  379. +    ALOGE("load: return %i", status);
  380.      return status;
  381.  }
  382.  
  383.  int hw_get_module_by_class(const char *class_id, const char *inst,
  384.                             const struct hw_module_t **module)
  385.  {
  386. +    ALOGV("%s - class_id : %s; inst : %s", __func__, class_id, inst);
  387.      int status;
  388.      int i;
  389.      const struct hw_module_t *hmi = NULL;
  390. @@ -132,6 +146,8 @@ int hw_get_module_by_class(const char *class_id, const char *inst,
  391.      else
  392.          strlcpy(name, class_id, PATH_MAX);
  393.  
  394. +    ALOGV("%s: %i - name: %s", __func__, __LINE__, name);
  395. +
  396.      /*
  397.       * Here we rely on the fact that calling dlopen multiple times on
  398.       * the same .so will simply increment a refcount (and not load
  399. @@ -141,28 +157,35 @@ int hw_get_module_by_class(const char *class_id, const char *inst,
  400.  
  401.      /* Loop through the configuration variants looking for a module */
  402.      for (i=0 ; i<HAL_VARIANT_KEYS_COUNT+1 ; i++) {
  403. +        ALOGV("%s: %i (i=%i)", __func__, __LINE__, i);
  404.          if (i < HAL_VARIANT_KEYS_COUNT) {
  405.              if (property_get(variant_keys[i], prop, NULL) == 0) {
  406.                  continue;
  407.              }
  408.              snprintf(path, sizeof(path), "%s/%s.%s.so",
  409.                       HAL_LIBRARY_PATH2, name, prop);
  410. +            ALOGV("%s: %i - path 1: %s", __func__, __LINE__, path);
  411.              if (access(path, R_OK) == 0) break;
  412.  
  413.              snprintf(path, sizeof(path), "%s/%s.%s.so",
  414.                       HAL_LIBRARY_PATH1, name, prop);
  415. +            ALOGV("%s: %i - path 2: %s", __func__, __LINE__, path);
  416.              if (access(path, R_OK) == 0) break;
  417.          } else {
  418.              snprintf(path, sizeof(path), "%s/%s.default.so",
  419.                       HAL_LIBRARY_PATH1, name);
  420. +            ALOGV("%s: %i - path 3: %s", __func__, __LINE__, path);
  421.              if (access(path, R_OK) == 0) break;
  422.          }
  423.      }
  424.  
  425. +    ALOGV("%s: %i - path end: %s", __func__, __LINE__, path);
  426. +
  427.      status = -ENOENT;
  428.      if (i < HAL_VARIANT_KEYS_COUNT+1) {
  429.          /* load the module, if this fails, we're doomed, and we should not try
  430.           * to load a different variant. */
  431. +        ALOGV("%s: we might be doomed...", __func__);
  432.          status = load(class_id, path, module);
  433.      }
  434.  
  435.  
  436. project hardware/msm7k/
  437. diff --git a/libstagefrighthw/Android.mk b/libstagefrighthw/Android.mk
  438. index a8a4a5f..d36bff7 100644
  439. --- a/libstagefrighthw/Android.mk
  440. +++ b/libstagefrighthw/Android.mk
  441. @@ -14,26 +14,26 @@
  442.  # limitations under the License.
  443.  #
  444.  
  445. -LOCAL_PATH := $(call my-dir)
  446. -include $(CLEAR_VARS)
  447. -
  448. -LOCAL_SRC_FILES := \
  449. -    QComOMXPlugin.cpp                      \
  450. -
  451. -LOCAL_CFLAGS := $(PV_CFLAGS_MINUS_VISIBILITY)
  452. -
  453. -LOCAL_C_INCLUDES:= \
  454. -        $(TOP)/frameworks/native/include/media/hardware \
  455. -        $(TOP)/frameworks/native/include/media/openmax
  456. -
  457. -LOCAL_SHARED_LIBRARIES :=       \
  458. -        libbinder               \
  459. -        libutils                \
  460. -        libcutils               \
  461. -        libdl                   \
  462. -        libui                   \
  463. -
  464. -LOCAL_MODULE := libstagefrighthw
  465. -LOCAL_MODULE_TAGS := optional
  466. -include $(BUILD_SHARED_LIBRARY)
  467. +#LOCAL_PATH := $(call my-dir)
  468. +#include $(CLEAR_VARS)
  469. +#
  470. +#LOCAL_SRC_FILES := \
  471. +#    QComOMXPlugin.cpp                      \
  472. +#
  473. +#LOCAL_CFLAGS := $(PV_CFLAGS_MINUS_VISIBILITY)
  474. +#
  475. +#LOCAL_C_INCLUDES:= \
  476. +#        $(TOP)/frameworks/native/include/media/hardware \
  477. +#        $(TOP)/frameworks/native/include/media/openmax
  478. +#
  479. +#LOCAL_SHARED_LIBRARIES :=       \
  480. +#        libbinder               \
  481. +#        libutils                \
  482. +#        libcutils               \
  483. +#        libdl                   \
  484. +#        libui                   \
  485. +#
  486. +#LOCAL_MODULE := libstagefrighthw
  487. +#LOCAL_MODULE_TAGS := optional
  488. +#include $(BUILD_SHARED_LIBRARY)
  489.  
  490.  
  491. project hardware/qcom/display/
  492. diff --git a/liboverlay/mdpWrapper.h b/liboverlay/mdpWrapper.h
  493. index 4cfd3e0..6e3fdf4 100644
  494. --- a/liboverlay/mdpWrapper.h
  495. +++ b/liboverlay/mdpWrapper.h
  496. @@ -247,12 +247,12 @@ inline void dump(const char* const s, const msm_rotator_img_info& rot) {
  497.      dump("src_rect", rot.src_rect);
  498.  }
  499.  inline void dump(const char* const s, const msm_rotator_data_info& rot) {
  500. -    ALOGE("%s msm_rotator_data_info sessid=%d verkey=%d",
  501. -            s, rot.session_id, rot.version_key);
  502. +    //ALOGE("%s msm_rotator_data_info sessid=%d verkey=%d",
  503. +    //        s, rot.session_id, rot.version_key);
  504.      dump("src", rot.src);
  505.      dump("dst", rot.dst);
  506. -    dump("src_chroma", rot.src_chroma);
  507. -    dump("dst_chroma", rot.dst_chroma);
  508. +    //dump("src_chroma", rot.src_chroma);
  509. +    //dump("dst_chroma", rot.dst_chroma);
  510.  }
  511.  inline void dump(const char* const s, const fb_fix_screeninfo& finfo) {
  512.      ALOGE("%s fb_fix_screeninfo type=%d", s, finfo.type);
  513.  
  514. project kernel/htc/msm7x30/
  515. diff --git a/drivers/net/wireless/bcm4329/Makefile b/drivers/net/wireless/bcm4329/Makefile
  516. index 5a662be..0c84dd5 100644
  517. --- a/drivers/net/wireless/bcm4329/Makefile
  518. +++ b/drivers/net/wireless/bcm4329/Makefile
  519. @@ -3,7 +3,7 @@ DHDCFLAGS = -DLINUX -DBCMDRIVER -DBCMDONGLEHOST -DDHDTHREAD -DBCMWPA2         \
  520.         -DUNRELEASEDCHIP -Dlinux -DDHD_SDALIGN=64 -DMAX_HDR_READ=64           \
  521.         -DDHD_FIRSTREAD=64 -DDHD_GPL -DDHD_SCHED -DBDC -DTOE -DDHD_BCMEVENTS  \
  522.         -DSHOW_EVENTS -DBCMSDIO -DDHD_GPL -DBCMLXSDMMC -DBCMPLATFORM_BUS      \
  523. -       -Wall -Wstrict-prototypes -Werror -DOOB_INTR_ONLY -DCUSTOMER_HW2      \
  524. +       -Wall -Wstrict-prototypes -DOOB_INTR_ONLY -DCUSTOMER_HW2      \
  525.         -DDHD_USE_STATIC_BUF -DMMC_SDIO_ABORT -DDHD_DEBUG_TRAP -DSOFTAP       \
  526.         -DEMBEDDED_PLATFORM -DARP_OFFLOAD_SUPPORT -DPKT_FILTER_SUPPORT        \
  527.         -DGET_CUSTOM_MAC_ENABLE -DSET_RANDOM_MAC_SOFTAP -DCSCAN -DHW_OOB      \
  528. diff --git a/drivers/net/wireless/bcm4329/wl_iw.c b/drivers/net/wireless/bcm4329/wl_iw.c
  529. index d45b025..d64eba8 100644
  530. --- a/drivers/net/wireless/bcm4329/wl_iw.c
  531. +++ b/drivers/net/wireless/bcm4329/wl_iw.c
  532. @@ -1985,7 +1985,7 @@ static int iwpriv_get_assoc_list(struct net_device *dev,
  533.         p_mac_str_end = &mac_lst[sizeof(mac_lst)-1];
  534.  
  535.         for (i = 0; i < 8; i++) {
  536. -               struct ether_addr *id = &sta_maclist->ea[i];
  537. +               struct ether_addr *id = sta_maclist[i].ea;
  538.                 if (!ETHER_ISNULLADDR(id->octet)) {
  539.                         scb_val_t scb_val;
  540.                         int rssi = 0;
  541. diff --git a/drivers/net/wireless/bcm4329_204/Makefile b/drivers/net/wireless/bcm4329_204/Makefile
  542. index bef4546..802135f 100644
  543. --- a/drivers/net/wireless/bcm4329_204/Makefile
  544. +++ b/drivers/net/wireless/bcm4329_204/Makefile
  545. @@ -3,7 +3,7 @@ DHDCFLAGS = -DLINUX -DBCMDRIVER -DBCMDONGLEHOST -DDHDTHREAD -DBCMWPA2         \
  546.         -DUNRELEASEDCHIP -Dlinux -DDHD_SDALIGN=64 -DMAX_HDR_READ=64           \
  547.         -DDHD_FIRSTREAD=64 -DDHD_GPL -DDHD_SCHED -DBDC -DTOE -DDHD_BCMEVENTS  \
  548.         -DSHOW_EVENTS -DBCMSDIO -DDHD_GPL -DBCMLXSDMMC -DBCMPLATFORM_BUS      \
  549. -       -Wall -Wstrict-prototypes -Werror -DOOB_INTR_ONLY -DCUSTOMER_HW2      \
  550. +       -Wall -Wstrict-prototypes -DOOB_INTR_ONLY -DCUSTOMER_HW2      \
  551.         -DDHD_USE_STATIC_BUF -DMMC_SDIO_ABORT -DWLAN_PFN -DWLAN_PROTECT       \
  552.         -DBCMWAPI_WPI -DWLAN_LOW_RSSI_IND -DCSCAN -DSOFTAP_PROTECT \
  553.         -DMMC_RECOVER -DBCM4329_LOW_POWER -DHTC_KlocWork\
  554.  
  555. project prebuilts/ndk/
  556. diff --git a/android-ndk-r7/platforms/android-14/arch-arm/usr/include/linux/android_pmem.h b/android-ndk-r7/platforms/android-14/arch-arm/usr/include/linux/android_pmem.h
  557. index 858857e..454078b 100644
  558. --- a/android-ndk-r7/platforms/android-14/arch-arm/usr/include/linux/android_pmem.h
  559. +++ b/android-ndk-r7/platforms/android-14/arch-arm/usr/include/linux/android_pmem.h
  560. @@ -36,6 +36,7 @@ struct pmem_region {
  561.  #define PMEM_GET_TOTAL_SIZE _IOW(PMEM_IOCTL_MAGIC, 7, struct pmem_region *)
  562.  
  563.  #define HW3D_REVOKE_GPU _IOW(PMEM_IOCTL_MAGIC, 8, unsigned int)
  564. +#define PMEM_CACHE_FLUSH _IOW(PMEM_IOCTL_MAGIC, 8, unsigned int)
  565.  #define HW3D_GRANT_GPU _IOW(PMEM_IOCTL_MAGIC, 9, unsigned int)
  566.  #define HW3D_WAIT_IRQ _IOW(PMEM_IOCTL_MAGIC,10, unsigned int)
create a new version of this paste RAW Paste Data