Commit a003776

authored and

Android (Google) Code Review

committed

Merge changes I7459b9e9,I9bc5573e

* changes: frameworks base Android.mk file changes Deleted the media, camera, drm related files since they are relocated

2 parents 5907564 + ba4d043 commit a003776Copy full SHA for a003776

2,339 files changed

+17

-657161

lines changed

cmds/stagefright
core/jni
- ActivityManager.cpp
- Android.mk
drm
- common
- drmserver
- jni
  - Android.mk
- libdrmframework
  - Android.mk
  - DrmManagerClient.cpp
  - DrmManagerClientImpl.cpp
  - include
  - plugins
    - Android.mk
    - common
      - Android.mk
      - include
        DrmEngineBase.h
        IDrmEngine.h
      - util
        Android.mk
        include
        MimeTypeUtil.h
        SessionMap.h
        src
        MimeTypeUtil.cpp
    - forward-lock
      - Android.mk
      - FwdLockEngine
        Android.mk
        include
        FwdLockEngine.h
        src
        FwdLockEngine.cpp
      - internal-format
        Android.mk
        common
        Android.mk
        FwdLockGlue.c
        FwdLockGlue.h
        converter
        Android.mk
        FwdLockConv.c
        FwdLockConv.h
        decoder
        Android.mk
        FwdLockFile.c
        FwdLockFile.h
        doc
        FwdLock.html
        images
        image001.gif
        image002.gif
        image003.gif
        image004.gif
        image005.gif
        image006.gif
    - passthru
      - Android.mk
      - include
        DrmPassthruPlugIn.h
      - src
        DrmPassthruPlugIn.cpp
include
libs
- camera
- common_time
media
services
- audioflinger
- camera
  - libcameraservice
  - tests/CameraServiceTest
    - Android.mk
    - CameraServiceTest.cpp
voip/jni/rtp
- Android.mk

2,339 files changed

+17

-657161

lines changed

`‎cmds/stagefright/Android.mk‎`

This file was deleted.

Comments

(0)