Merge "msm8998: rename msmcobalt to msm8998" into nyc-mr2-dev
diff --git a/Android.mk b/Android.mk
index 9922980..39255be 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,8 +5,8 @@
ifneq ($(filter msm8996,$(TARGET_BOARD_PLATFORM)),)
include $(addsuffix /Android.mk, $(addprefix $(call my-dir)/, mm-image-codec QCamera2))
endif
- ifneq ($(filter msmcobalt,$(TARGET_BOARD_PLATFORM)),)
- include $(call all-makefiles-under,$(call my-dir)/msmcobalt)
+ ifneq ($(filter msm8998,$(TARGET_BOARD_PLATFORM)),)
+ include $(call all-makefiles-under,$(call my-dir)/msm8998)
endif
endif
endif
diff --git a/msmcobalt/Android.mk b/msm8998/Android.mk
similarity index 100%
rename from msmcobalt/Android.mk
rename to msm8998/Android.mk
diff --git a/msmcobalt/CleanSpec.mk b/msm8998/CleanSpec.mk
similarity index 100%
rename from msmcobalt/CleanSpec.mk
rename to msm8998/CleanSpec.mk
diff --git a/msmcobalt/MODULE_LICENSE_BSD b/msm8998/MODULE_LICENSE_BSD
similarity index 100%
rename from msmcobalt/MODULE_LICENSE_BSD
rename to msm8998/MODULE_LICENSE_BSD
diff --git a/msmcobalt/QCamera2/Android.mk b/msm8998/QCamera2/Android.mk
similarity index 100%
rename from msmcobalt/QCamera2/Android.mk
rename to msm8998/QCamera2/Android.mk
diff --git a/msmcobalt/QCamera2/HAL/QCamera2HWI.cpp b/msm8998/QCamera2/HAL/QCamera2HWI.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL/QCamera2HWI.cpp
rename to msm8998/QCamera2/HAL/QCamera2HWI.cpp
diff --git a/msmcobalt/QCamera2/HAL/QCamera2HWI.h b/msm8998/QCamera2/HAL/QCamera2HWI.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL/QCamera2HWI.h
rename to msm8998/QCamera2/HAL/QCamera2HWI.h
diff --git a/msmcobalt/QCamera2/HAL/QCamera2HWICallbacks.cpp b/msm8998/QCamera2/HAL/QCamera2HWICallbacks.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL/QCamera2HWICallbacks.cpp
rename to msm8998/QCamera2/HAL/QCamera2HWICallbacks.cpp
diff --git a/msmcobalt/QCamera2/HAL/QCameraAllocator.h b/msm8998/QCamera2/HAL/QCameraAllocator.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL/QCameraAllocator.h
rename to msm8998/QCamera2/HAL/QCameraAllocator.h
diff --git a/msmcobalt/QCamera2/HAL/QCameraChannel.cpp b/msm8998/QCamera2/HAL/QCameraChannel.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL/QCameraChannel.cpp
rename to msm8998/QCamera2/HAL/QCameraChannel.cpp
diff --git a/msmcobalt/QCamera2/HAL/QCameraChannel.h b/msm8998/QCamera2/HAL/QCameraChannel.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL/QCameraChannel.h
rename to msm8998/QCamera2/HAL/QCameraChannel.h
diff --git a/msmcobalt/QCamera2/HAL/QCameraMem.cpp b/msm8998/QCamera2/HAL/QCameraMem.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL/QCameraMem.cpp
rename to msm8998/QCamera2/HAL/QCameraMem.cpp
diff --git a/msmcobalt/QCamera2/HAL/QCameraMem.h b/msm8998/QCamera2/HAL/QCameraMem.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL/QCameraMem.h
rename to msm8998/QCamera2/HAL/QCameraMem.h
diff --git a/msmcobalt/QCamera2/HAL/QCameraMuxer.cpp b/msm8998/QCamera2/HAL/QCameraMuxer.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL/QCameraMuxer.cpp
rename to msm8998/QCamera2/HAL/QCameraMuxer.cpp
diff --git a/msmcobalt/QCamera2/HAL/QCameraMuxer.h b/msm8998/QCamera2/HAL/QCameraMuxer.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL/QCameraMuxer.h
rename to msm8998/QCamera2/HAL/QCameraMuxer.h
diff --git a/msmcobalt/QCamera2/HAL/QCameraParameters.cpp b/msm8998/QCamera2/HAL/QCameraParameters.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL/QCameraParameters.cpp
rename to msm8998/QCamera2/HAL/QCameraParameters.cpp
diff --git a/msmcobalt/QCamera2/HAL/QCameraParameters.h b/msm8998/QCamera2/HAL/QCameraParameters.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL/QCameraParameters.h
rename to msm8998/QCamera2/HAL/QCameraParameters.h
diff --git a/msmcobalt/QCamera2/HAL/QCameraParametersIntf.cpp b/msm8998/QCamera2/HAL/QCameraParametersIntf.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL/QCameraParametersIntf.cpp
rename to msm8998/QCamera2/HAL/QCameraParametersIntf.cpp
diff --git a/msmcobalt/QCamera2/HAL/QCameraParametersIntf.h b/msm8998/QCamera2/HAL/QCameraParametersIntf.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL/QCameraParametersIntf.h
rename to msm8998/QCamera2/HAL/QCameraParametersIntf.h
diff --git a/msmcobalt/QCamera2/HAL/QCameraPostProc.cpp b/msm8998/QCamera2/HAL/QCameraPostProc.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL/QCameraPostProc.cpp
rename to msm8998/QCamera2/HAL/QCameraPostProc.cpp
diff --git a/msmcobalt/QCamera2/HAL/QCameraPostProc.h b/msm8998/QCamera2/HAL/QCameraPostProc.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL/QCameraPostProc.h
rename to msm8998/QCamera2/HAL/QCameraPostProc.h
diff --git a/msmcobalt/QCamera2/HAL/QCameraStateMachine.cpp b/msm8998/QCamera2/HAL/QCameraStateMachine.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL/QCameraStateMachine.cpp
rename to msm8998/QCamera2/HAL/QCameraStateMachine.cpp
diff --git a/msmcobalt/QCamera2/HAL/QCameraStateMachine.h b/msm8998/QCamera2/HAL/QCameraStateMachine.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL/QCameraStateMachine.h
rename to msm8998/QCamera2/HAL/QCameraStateMachine.h
diff --git a/msmcobalt/QCamera2/HAL/QCameraStream.cpp b/msm8998/QCamera2/HAL/QCameraStream.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL/QCameraStream.cpp
rename to msm8998/QCamera2/HAL/QCameraStream.cpp
diff --git a/msmcobalt/QCamera2/HAL/QCameraStream.h b/msm8998/QCamera2/HAL/QCameraStream.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL/QCameraStream.h
rename to msm8998/QCamera2/HAL/QCameraStream.h
diff --git a/msmcobalt/QCamera2/HAL/QCameraThermalAdapter.cpp b/msm8998/QCamera2/HAL/QCameraThermalAdapter.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL/QCameraThermalAdapter.cpp
rename to msm8998/QCamera2/HAL/QCameraThermalAdapter.cpp
diff --git a/msmcobalt/QCamera2/HAL/QCameraThermalAdapter.h b/msm8998/QCamera2/HAL/QCameraThermalAdapter.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL/QCameraThermalAdapter.h
rename to msm8998/QCamera2/HAL/QCameraThermalAdapter.h
diff --git a/msmcobalt/QCamera2/HAL/android/QCamera2External.h b/msm8998/QCamera2/HAL/android/QCamera2External.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL/android/QCamera2External.h
rename to msm8998/QCamera2/HAL/android/QCamera2External.h
diff --git a/msmcobalt/QCamera2/HAL/test/Android.mk b/msm8998/QCamera2/HAL/test/Android.mk
similarity index 100%
rename from msmcobalt/QCamera2/HAL/test/Android.mk
rename to msm8998/QCamera2/HAL/test/Android.mk
diff --git a/msmcobalt/QCamera2/HAL/test/qcamera_test.cpp b/msm8998/QCamera2/HAL/test/qcamera_test.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL/test/qcamera_test.cpp
rename to msm8998/QCamera2/HAL/test/qcamera_test.cpp
diff --git a/msmcobalt/QCamera2/HAL/test/qcamera_test.h b/msm8998/QCamera2/HAL/test/qcamera_test.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL/test/qcamera_test.h
rename to msm8998/QCamera2/HAL/test/qcamera_test.h
diff --git a/msmcobalt/QCamera2/HAL/tsMakeuplib/include/ts_detectface_engine.h b/msm8998/QCamera2/HAL/tsMakeuplib/include/ts_detectface_engine.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL/tsMakeuplib/include/ts_detectface_engine.h
rename to msm8998/QCamera2/HAL/tsMakeuplib/include/ts_detectface_engine.h
diff --git a/msmcobalt/QCamera2/HAL/tsMakeuplib/include/ts_makeup_data.h b/msm8998/QCamera2/HAL/tsMakeuplib/include/ts_makeup_data.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL/tsMakeuplib/include/ts_makeup_data.h
rename to msm8998/QCamera2/HAL/tsMakeuplib/include/ts_makeup_data.h
diff --git a/msmcobalt/QCamera2/HAL/tsMakeuplib/include/ts_makeup_engine.h b/msm8998/QCamera2/HAL/tsMakeuplib/include/ts_makeup_engine.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL/tsMakeuplib/include/ts_makeup_engine.h
rename to msm8998/QCamera2/HAL/tsMakeuplib/include/ts_makeup_engine.h
diff --git a/msmcobalt/QCamera2/HAL/tsMakeuplib/include/ts_makeup_image.h b/msm8998/QCamera2/HAL/tsMakeuplib/include/ts_makeup_image.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL/tsMakeuplib/include/ts_makeup_image.h
rename to msm8998/QCamera2/HAL/tsMakeuplib/include/ts_makeup_image.h
diff --git a/msmcobalt/QCamera2/HAL/wrapper/QualcommCamera.cpp b/msm8998/QCamera2/HAL/wrapper/QualcommCamera.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL/wrapper/QualcommCamera.cpp
rename to msm8998/QCamera2/HAL/wrapper/QualcommCamera.cpp
diff --git a/msmcobalt/QCamera2/HAL/wrapper/QualcommCamera.h b/msm8998/QCamera2/HAL/wrapper/QualcommCamera.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL/wrapper/QualcommCamera.h
rename to msm8998/QCamera2/HAL/wrapper/QualcommCamera.h
diff --git a/msmcobalt/QCamera2/HAL3/QCamera3Channel.cpp b/msm8998/QCamera2/HAL3/QCamera3Channel.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/QCamera3Channel.cpp
rename to msm8998/QCamera2/HAL3/QCamera3Channel.cpp
diff --git a/msmcobalt/QCamera2/HAL3/QCamera3Channel.h b/msm8998/QCamera2/HAL3/QCamera3Channel.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/QCamera3Channel.h
rename to msm8998/QCamera2/HAL3/QCamera3Channel.h
diff --git a/msmcobalt/QCamera2/HAL3/QCamera3CropRegionMapper.cpp b/msm8998/QCamera2/HAL3/QCamera3CropRegionMapper.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/QCamera3CropRegionMapper.cpp
rename to msm8998/QCamera2/HAL3/QCamera3CropRegionMapper.cpp
diff --git a/msmcobalt/QCamera2/HAL3/QCamera3CropRegionMapper.h b/msm8998/QCamera2/HAL3/QCamera3CropRegionMapper.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/QCamera3CropRegionMapper.h
rename to msm8998/QCamera2/HAL3/QCamera3CropRegionMapper.h
diff --git a/msmcobalt/QCamera2/HAL3/QCamera3HALHeader.h b/msm8998/QCamera2/HAL3/QCamera3HALHeader.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/QCamera3HALHeader.h
rename to msm8998/QCamera2/HAL3/QCamera3HALHeader.h
diff --git a/msmcobalt/QCamera2/HAL3/QCamera3HWI.cpp b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/QCamera3HWI.cpp
rename to msm8998/QCamera2/HAL3/QCamera3HWI.cpp
diff --git a/msmcobalt/QCamera2/HAL3/QCamera3HWI.h b/msm8998/QCamera2/HAL3/QCamera3HWI.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/QCamera3HWI.h
rename to msm8998/QCamera2/HAL3/QCamera3HWI.h
diff --git a/msmcobalt/QCamera2/HAL3/QCamera3Mem.cpp b/msm8998/QCamera2/HAL3/QCamera3Mem.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/QCamera3Mem.cpp
rename to msm8998/QCamera2/HAL3/QCamera3Mem.cpp
diff --git a/msmcobalt/QCamera2/HAL3/QCamera3Mem.h b/msm8998/QCamera2/HAL3/QCamera3Mem.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/QCamera3Mem.h
rename to msm8998/QCamera2/HAL3/QCamera3Mem.h
diff --git a/msmcobalt/QCamera2/HAL3/QCamera3PostProc.cpp b/msm8998/QCamera2/HAL3/QCamera3PostProc.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/QCamera3PostProc.cpp
rename to msm8998/QCamera2/HAL3/QCamera3PostProc.cpp
diff --git a/msmcobalt/QCamera2/HAL3/QCamera3PostProc.h b/msm8998/QCamera2/HAL3/QCamera3PostProc.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/QCamera3PostProc.h
rename to msm8998/QCamera2/HAL3/QCamera3PostProc.h
diff --git a/msmcobalt/QCamera2/HAL3/QCamera3Stream.cpp b/msm8998/QCamera2/HAL3/QCamera3Stream.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/QCamera3Stream.cpp
rename to msm8998/QCamera2/HAL3/QCamera3Stream.cpp
diff --git a/msmcobalt/QCamera2/HAL3/QCamera3Stream.h b/msm8998/QCamera2/HAL3/QCamera3Stream.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/QCamera3Stream.h
rename to msm8998/QCamera2/HAL3/QCamera3Stream.h
diff --git a/msmcobalt/QCamera2/HAL3/QCamera3StreamMem.cpp b/msm8998/QCamera2/HAL3/QCamera3StreamMem.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/QCamera3StreamMem.cpp
rename to msm8998/QCamera2/HAL3/QCamera3StreamMem.cpp
diff --git a/msmcobalt/QCamera2/HAL3/QCamera3StreamMem.h b/msm8998/QCamera2/HAL3/QCamera3StreamMem.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/QCamera3StreamMem.h
rename to msm8998/QCamera2/HAL3/QCamera3StreamMem.h
diff --git a/msmcobalt/QCamera2/HAL3/QCamera3VendorTags.cpp b/msm8998/QCamera2/HAL3/QCamera3VendorTags.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/QCamera3VendorTags.cpp
rename to msm8998/QCamera2/HAL3/QCamera3VendorTags.cpp
diff --git a/msmcobalt/QCamera2/HAL3/QCamera3VendorTags.h b/msm8998/QCamera2/HAL3/QCamera3VendorTags.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/QCamera3VendorTags.h
rename to msm8998/QCamera2/HAL3/QCamera3VendorTags.h
diff --git a/msmcobalt/QCamera2/HAL3/android/QCamera3External.h b/msm8998/QCamera2/HAL3/android/QCamera3External.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/android/QCamera3External.h
rename to msm8998/QCamera2/HAL3/android/QCamera3External.h
diff --git a/msmcobalt/QCamera2/HAL3/test/Android.mk b/msm8998/QCamera2/HAL3/test/Android.mk
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/test/Android.mk
rename to msm8998/QCamera2/HAL3/test/Android.mk
diff --git a/msmcobalt/QCamera2/HAL3/test/QCameraHAL3Base.cpp b/msm8998/QCamera2/HAL3/test/QCameraHAL3Base.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/test/QCameraHAL3Base.cpp
rename to msm8998/QCamera2/HAL3/test/QCameraHAL3Base.cpp
diff --git a/msmcobalt/QCamera2/HAL3/test/QCameraHAL3Base.h b/msm8998/QCamera2/HAL3/test/QCameraHAL3Base.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/test/QCameraHAL3Base.h
rename to msm8998/QCamera2/HAL3/test/QCameraHAL3Base.h
diff --git a/msmcobalt/QCamera2/HAL3/test/QCameraHAL3MainTestContext.cpp b/msm8998/QCamera2/HAL3/test/QCameraHAL3MainTestContext.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/test/QCameraHAL3MainTestContext.cpp
rename to msm8998/QCamera2/HAL3/test/QCameraHAL3MainTestContext.cpp
diff --git a/msmcobalt/QCamera2/HAL3/test/QCameraHAL3MainTestContext.h b/msm8998/QCamera2/HAL3/test/QCameraHAL3MainTestContext.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/test/QCameraHAL3MainTestContext.h
rename to msm8998/QCamera2/HAL3/test/QCameraHAL3MainTestContext.h
diff --git a/msmcobalt/QCamera2/HAL3/test/QCameraHAL3PreviewTest.cpp b/msm8998/QCamera2/HAL3/test/QCameraHAL3PreviewTest.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/test/QCameraHAL3PreviewTest.cpp
rename to msm8998/QCamera2/HAL3/test/QCameraHAL3PreviewTest.cpp
diff --git a/msmcobalt/QCamera2/HAL3/test/QCameraHAL3PreviewTest.h b/msm8998/QCamera2/HAL3/test/QCameraHAL3PreviewTest.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/test/QCameraHAL3PreviewTest.h
rename to msm8998/QCamera2/HAL3/test/QCameraHAL3PreviewTest.h
diff --git a/msmcobalt/QCamera2/HAL3/test/QCameraHAL3RawSnapshotTest.cpp b/msm8998/QCamera2/HAL3/test/QCameraHAL3RawSnapshotTest.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/test/QCameraHAL3RawSnapshotTest.cpp
rename to msm8998/QCamera2/HAL3/test/QCameraHAL3RawSnapshotTest.cpp
diff --git a/msmcobalt/QCamera2/HAL3/test/QCameraHAL3RawSnapshotTest.h b/msm8998/QCamera2/HAL3/test/QCameraHAL3RawSnapshotTest.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/test/QCameraHAL3RawSnapshotTest.h
rename to msm8998/QCamera2/HAL3/test/QCameraHAL3RawSnapshotTest.h
diff --git a/msmcobalt/QCamera2/HAL3/test/QCameraHAL3SnapshotTest.cpp b/msm8998/QCamera2/HAL3/test/QCameraHAL3SnapshotTest.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/test/QCameraHAL3SnapshotTest.cpp
rename to msm8998/QCamera2/HAL3/test/QCameraHAL3SnapshotTest.cpp
diff --git a/msmcobalt/QCamera2/HAL3/test/QCameraHAL3SnapshotTest.h b/msm8998/QCamera2/HAL3/test/QCameraHAL3SnapshotTest.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/test/QCameraHAL3SnapshotTest.h
rename to msm8998/QCamera2/HAL3/test/QCameraHAL3SnapshotTest.h
diff --git a/msmcobalt/QCamera2/HAL3/test/QCameraHAL3Test.cpp b/msm8998/QCamera2/HAL3/test/QCameraHAL3Test.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/test/QCameraHAL3Test.cpp
rename to msm8998/QCamera2/HAL3/test/QCameraHAL3Test.cpp
diff --git a/msmcobalt/QCamera2/HAL3/test/QCameraHAL3Test.h b/msm8998/QCamera2/HAL3/test/QCameraHAL3Test.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/test/QCameraHAL3Test.h
rename to msm8998/QCamera2/HAL3/test/QCameraHAL3Test.h
diff --git a/msmcobalt/QCamera2/HAL3/test/QCameraHAL3VideoTest.cpp b/msm8998/QCamera2/HAL3/test/QCameraHAL3VideoTest.cpp
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/test/QCameraHAL3VideoTest.cpp
rename to msm8998/QCamera2/HAL3/test/QCameraHAL3VideoTest.cpp
diff --git a/msmcobalt/QCamera2/HAL3/test/QCameraHAL3VideoTest.h b/msm8998/QCamera2/HAL3/test/QCameraHAL3VideoTest.h
similarity index 100%
rename from msmcobalt/QCamera2/HAL3/test/QCameraHAL3VideoTest.h
rename to msm8998/QCamera2/HAL3/test/QCameraHAL3VideoTest.h
diff --git a/msmcobalt/QCamera2/QCamera2Factory.cpp b/msm8998/QCamera2/QCamera2Factory.cpp
similarity index 100%
rename from msmcobalt/QCamera2/QCamera2Factory.cpp
rename to msm8998/QCamera2/QCamera2Factory.cpp
diff --git a/msmcobalt/QCamera2/QCamera2Factory.h b/msm8998/QCamera2/QCamera2Factory.h
similarity index 100%
rename from msmcobalt/QCamera2/QCamera2Factory.h
rename to msm8998/QCamera2/QCamera2Factory.h
diff --git a/msmcobalt/QCamera2/QCamera2Hal.cpp b/msm8998/QCamera2/QCamera2Hal.cpp
similarity index 100%
rename from msmcobalt/QCamera2/QCamera2Hal.cpp
rename to msm8998/QCamera2/QCamera2Hal.cpp
diff --git a/msmcobalt/QCamera2/QCameraFormat.h b/msm8998/QCamera2/QCameraFormat.h
similarity index 100%
rename from msmcobalt/QCamera2/QCameraFormat.h
rename to msm8998/QCamera2/QCameraFormat.h
diff --git a/msmcobalt/QCamera2/stack/Android.mk b/msm8998/QCamera2/stack/Android.mk
similarity index 100%
rename from msmcobalt/QCamera2/stack/Android.mk
rename to msm8998/QCamera2/stack/Android.mk
diff --git a/msmcobalt/QCamera2/stack/common/cam_intf.h b/msm8998/QCamera2/stack/common/cam_intf.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/common/cam_intf.h
rename to msm8998/QCamera2/stack/common/cam_intf.h
diff --git a/msmcobalt/QCamera2/stack/common/cam_list.h b/msm8998/QCamera2/stack/common/cam_list.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/common/cam_list.h
rename to msm8998/QCamera2/stack/common/cam_list.h
diff --git a/msmcobalt/QCamera2/stack/common/cam_queue.h b/msm8998/QCamera2/stack/common/cam_queue.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/common/cam_queue.h
rename to msm8998/QCamera2/stack/common/cam_queue.h
diff --git a/msmcobalt/QCamera2/stack/common/cam_semaphore.h b/msm8998/QCamera2/stack/common/cam_semaphore.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/common/cam_semaphore.h
rename to msm8998/QCamera2/stack/common/cam_semaphore.h
diff --git a/msmcobalt/QCamera2/stack/common/cam_types.h b/msm8998/QCamera2/stack/common/cam_types.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/common/cam_types.h
rename to msm8998/QCamera2/stack/common/cam_types.h
diff --git a/msmcobalt/QCamera2/stack/common/camscope_packet_type.h b/msm8998/QCamera2/stack/common/camscope_packet_type.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/common/camscope_packet_type.h
rename to msm8998/QCamera2/stack/common/camscope_packet_type.h
diff --git a/msmcobalt/QCamera2/stack/common/mm_camera_interface.h b/msm8998/QCamera2/stack/common/mm_camera_interface.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/common/mm_camera_interface.h
rename to msm8998/QCamera2/stack/common/mm_camera_interface.h
diff --git a/msmcobalt/QCamera2/stack/common/mm_camera_shim.h b/msm8998/QCamera2/stack/common/mm_camera_shim.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/common/mm_camera_shim.h
rename to msm8998/QCamera2/stack/common/mm_camera_shim.h
diff --git a/msmcobalt/QCamera2/stack/common/mm_jpeg_interface.h b/msm8998/QCamera2/stack/common/mm_jpeg_interface.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/common/mm_jpeg_interface.h
rename to msm8998/QCamera2/stack/common/mm_jpeg_interface.h
diff --git a/msmcobalt/QCamera2/stack/mm-camera-interface/Android.mk b/msm8998/QCamera2/stack/mm-camera-interface/Android.mk
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-interface/Android.mk
rename to msm8998/QCamera2/stack/mm-camera-interface/Android.mk
diff --git a/msmcobalt/QCamera2/stack/mm-camera-interface/inc/mm_camera.h b/msm8998/QCamera2/stack/mm-camera-interface/inc/mm_camera.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-interface/inc/mm_camera.h
rename to msm8998/QCamera2/stack/mm-camera-interface/inc/mm_camera.h
diff --git a/msmcobalt/QCamera2/stack/mm-camera-interface/inc/mm_camera_dbg.h b/msm8998/QCamera2/stack/mm-camera-interface/inc/mm_camera_dbg.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-interface/inc/mm_camera_dbg.h
rename to msm8998/QCamera2/stack/mm-camera-interface/inc/mm_camera_dbg.h
diff --git a/msmcobalt/QCamera2/stack/mm-camera-interface/inc/mm_camera_muxer.h b/msm8998/QCamera2/stack/mm-camera-interface/inc/mm_camera_muxer.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-interface/inc/mm_camera_muxer.h
rename to msm8998/QCamera2/stack/mm-camera-interface/inc/mm_camera_muxer.h
diff --git a/msmcobalt/QCamera2/stack/mm-camera-interface/inc/mm_camera_sock.h b/msm8998/QCamera2/stack/mm-camera-interface/inc/mm_camera_sock.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-interface/inc/mm_camera_sock.h
rename to msm8998/QCamera2/stack/mm-camera-interface/inc/mm_camera_sock.h
diff --git a/msmcobalt/QCamera2/stack/mm-camera-interface/src/mm_camera.c b/msm8998/QCamera2/stack/mm-camera-interface/src/mm_camera.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-interface/src/mm_camera.c
rename to msm8998/QCamera2/stack/mm-camera-interface/src/mm_camera.c
diff --git a/msmcobalt/QCamera2/stack/mm-camera-interface/src/mm_camera_channel.c b/msm8998/QCamera2/stack/mm-camera-interface/src/mm_camera_channel.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-interface/src/mm_camera_channel.c
rename to msm8998/QCamera2/stack/mm-camera-interface/src/mm_camera_channel.c
diff --git a/msmcobalt/QCamera2/stack/mm-camera-interface/src/mm_camera_interface.c b/msm8998/QCamera2/stack/mm-camera-interface/src/mm_camera_interface.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-interface/src/mm_camera_interface.c
rename to msm8998/QCamera2/stack/mm-camera-interface/src/mm_camera_interface.c
diff --git a/msmcobalt/QCamera2/stack/mm-camera-interface/src/mm_camera_muxer.c b/msm8998/QCamera2/stack/mm-camera-interface/src/mm_camera_muxer.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-interface/src/mm_camera_muxer.c
rename to msm8998/QCamera2/stack/mm-camera-interface/src/mm_camera_muxer.c
diff --git a/msmcobalt/QCamera2/stack/mm-camera-interface/src/mm_camera_sock.c b/msm8998/QCamera2/stack/mm-camera-interface/src/mm_camera_sock.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-interface/src/mm_camera_sock.c
rename to msm8998/QCamera2/stack/mm-camera-interface/src/mm_camera_sock.c
diff --git a/msmcobalt/QCamera2/stack/mm-camera-interface/src/mm_camera_stream.c b/msm8998/QCamera2/stack/mm-camera-interface/src/mm_camera_stream.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-interface/src/mm_camera_stream.c
rename to msm8998/QCamera2/stack/mm-camera-interface/src/mm_camera_stream.c
diff --git a/msmcobalt/QCamera2/stack/mm-camera-interface/src/mm_camera_thread.c b/msm8998/QCamera2/stack/mm-camera-interface/src/mm_camera_thread.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-interface/src/mm_camera_thread.c
rename to msm8998/QCamera2/stack/mm-camera-interface/src/mm_camera_thread.c
diff --git a/msmcobalt/QCamera2/stack/mm-camera-test/Android.mk b/msm8998/QCamera2/stack/mm-camera-test/Android.mk
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-test/Android.mk
rename to msm8998/QCamera2/stack/mm-camera-test/Android.mk
diff --git a/msmcobalt/QCamera2/stack/mm-camera-test/inc/mm_qcamera_app.h b/msm8998/QCamera2/stack/mm-camera-test/inc/mm_qcamera_app.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-test/inc/mm_qcamera_app.h
rename to msm8998/QCamera2/stack/mm-camera-test/inc/mm_qcamera_app.h
diff --git a/msmcobalt/QCamera2/stack/mm-camera-test/inc/mm_qcamera_commands.h b/msm8998/QCamera2/stack/mm-camera-test/inc/mm_qcamera_commands.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-test/inc/mm_qcamera_commands.h
rename to msm8998/QCamera2/stack/mm-camera-test/inc/mm_qcamera_commands.h
diff --git a/msmcobalt/QCamera2/stack/mm-camera-test/inc/mm_qcamera_dbg.h b/msm8998/QCamera2/stack/mm-camera-test/inc/mm_qcamera_dbg.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-test/inc/mm_qcamera_dbg.h
rename to msm8998/QCamera2/stack/mm-camera-test/inc/mm_qcamera_dbg.h
diff --git a/msmcobalt/QCamera2/stack/mm-camera-test/inc/mm_qcamera_main_menu.h b/msm8998/QCamera2/stack/mm-camera-test/inc/mm_qcamera_main_menu.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-test/inc/mm_qcamera_main_menu.h
rename to msm8998/QCamera2/stack/mm-camera-test/inc/mm_qcamera_main_menu.h
diff --git a/msmcobalt/QCamera2/stack/mm-camera-test/inc/mm_qcamera_socket.h b/msm8998/QCamera2/stack/mm-camera-test/inc/mm_qcamera_socket.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-test/inc/mm_qcamera_socket.h
rename to msm8998/QCamera2/stack/mm-camera-test/inc/mm_qcamera_socket.h
diff --git a/msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_app.c b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_app.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_app.c
rename to msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_app.c
diff --git a/msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_commands.c b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_commands.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_commands.c
rename to msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_commands.c
diff --git a/msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_dual_test.c b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_dual_test.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_dual_test.c
rename to msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_dual_test.c
diff --git a/msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_main_menu.c b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_main_menu.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_main_menu.c
rename to msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_main_menu.c
diff --git a/msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_preview.c b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_preview.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_preview.c
rename to msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_preview.c
diff --git a/msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_queue.c b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_queue.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_queue.c
rename to msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_queue.c
diff --git a/msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_rdi.c b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_rdi.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_rdi.c
rename to msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_rdi.c
diff --git a/msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_reprocess.c b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_reprocess.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_reprocess.c
rename to msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_reprocess.c
diff --git a/msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_snapshot.c b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_snapshot.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_snapshot.c
rename to msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_snapshot.c
diff --git a/msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_socket.c b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_socket.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_socket.c
rename to msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_socket.c
diff --git a/msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_unit_test.c b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_unit_test.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_unit_test.c
rename to msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_unit_test.c
diff --git a/msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_video.c b/msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_video.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-camera-test/src/mm_qcamera_video.c
rename to msm8998/QCamera2/stack/mm-camera-test/src/mm_qcamera_video.c
diff --git a/msmcobalt/QCamera2/stack/mm-jpeg-interface/Android.mk b/msm8998/QCamera2/stack/mm-jpeg-interface/Android.mk
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-jpeg-interface/Android.mk
rename to msm8998/QCamera2/stack/mm-jpeg-interface/Android.mk
diff --git a/msmcobalt/QCamera2/stack/mm-jpeg-interface/inc/mm_jpeg.h b/msm8998/QCamera2/stack/mm-jpeg-interface/inc/mm_jpeg.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-jpeg-interface/inc/mm_jpeg.h
rename to msm8998/QCamera2/stack/mm-jpeg-interface/inc/mm_jpeg.h
diff --git a/msmcobalt/QCamera2/stack/mm-jpeg-interface/inc/mm_jpeg_dbg.h b/msm8998/QCamera2/stack/mm-jpeg-interface/inc/mm_jpeg_dbg.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-jpeg-interface/inc/mm_jpeg_dbg.h
rename to msm8998/QCamera2/stack/mm-jpeg-interface/inc/mm_jpeg_dbg.h
diff --git a/msmcobalt/QCamera2/stack/mm-jpeg-interface/inc/mm_jpeg_inlines.h b/msm8998/QCamera2/stack/mm-jpeg-interface/inc/mm_jpeg_inlines.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-jpeg-interface/inc/mm_jpeg_inlines.h
rename to msm8998/QCamera2/stack/mm-jpeg-interface/inc/mm_jpeg_inlines.h
diff --git a/msmcobalt/QCamera2/stack/mm-jpeg-interface/inc/mm_jpeg_ionbuf.h b/msm8998/QCamera2/stack/mm-jpeg-interface/inc/mm_jpeg_ionbuf.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-jpeg-interface/inc/mm_jpeg_ionbuf.h
rename to msm8998/QCamera2/stack/mm-jpeg-interface/inc/mm_jpeg_ionbuf.h
diff --git a/msmcobalt/QCamera2/stack/mm-jpeg-interface/inc/mm_jpeg_mpo.h b/msm8998/QCamera2/stack/mm-jpeg-interface/inc/mm_jpeg_mpo.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-jpeg-interface/inc/mm_jpeg_mpo.h
rename to msm8998/QCamera2/stack/mm-jpeg-interface/inc/mm_jpeg_mpo.h
diff --git a/msmcobalt/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg.c b/msm8998/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg.c
rename to msm8998/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg.c
diff --git a/msmcobalt/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_exif.c b/msm8998/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_exif.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_exif.c
rename to msm8998/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_exif.c
diff --git a/msmcobalt/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_interface.c b/msm8998/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_interface.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_interface.c
rename to msm8998/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_interface.c
diff --git a/msmcobalt/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_ionbuf.c b/msm8998/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_ionbuf.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_ionbuf.c
rename to msm8998/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_ionbuf.c
diff --git a/msmcobalt/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_mpo_composer.c b/msm8998/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_mpo_composer.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_mpo_composer.c
rename to msm8998/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_mpo_composer.c
diff --git a/msmcobalt/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_queue.c b/msm8998/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_queue.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_queue.c
rename to msm8998/QCamera2/stack/mm-jpeg-interface/src/mm_jpeg_queue.c
diff --git a/msmcobalt/QCamera2/stack/mm-jpeg-interface/src/mm_jpegdec.c b/msm8998/QCamera2/stack/mm-jpeg-interface/src/mm_jpegdec.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-jpeg-interface/src/mm_jpegdec.c
rename to msm8998/QCamera2/stack/mm-jpeg-interface/src/mm_jpegdec.c
diff --git a/msmcobalt/QCamera2/stack/mm-jpeg-interface/src/mm_jpegdec_interface.c b/msm8998/QCamera2/stack/mm-jpeg-interface/src/mm_jpegdec_interface.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-jpeg-interface/src/mm_jpegdec_interface.c
rename to msm8998/QCamera2/stack/mm-jpeg-interface/src/mm_jpegdec_interface.c
diff --git a/msmcobalt/QCamera2/stack/mm-jpeg-interface/test/Android.mk b/msm8998/QCamera2/stack/mm-jpeg-interface/test/Android.mk
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-jpeg-interface/test/Android.mk
rename to msm8998/QCamera2/stack/mm-jpeg-interface/test/Android.mk
diff --git a/msmcobalt/QCamera2/stack/mm-jpeg-interface/test/mm_jpeg_test.c b/msm8998/QCamera2/stack/mm-jpeg-interface/test/mm_jpeg_test.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-jpeg-interface/test/mm_jpeg_test.c
rename to msm8998/QCamera2/stack/mm-jpeg-interface/test/mm_jpeg_test.c
diff --git a/msmcobalt/QCamera2/stack/mm-jpeg-interface/test/mm_jpegdec_test.c b/msm8998/QCamera2/stack/mm-jpeg-interface/test/mm_jpegdec_test.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-jpeg-interface/test/mm_jpegdec_test.c
rename to msm8998/QCamera2/stack/mm-jpeg-interface/test/mm_jpegdec_test.c
diff --git a/msmcobalt/QCamera2/stack/mm-lib2d-interface/Android.mk b/msm8998/QCamera2/stack/mm-lib2d-interface/Android.mk
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-lib2d-interface/Android.mk
rename to msm8998/QCamera2/stack/mm-lib2d-interface/Android.mk
diff --git a/msmcobalt/QCamera2/stack/mm-lib2d-interface/inc/mm_lib2d.h b/msm8998/QCamera2/stack/mm-lib2d-interface/inc/mm_lib2d.h
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-lib2d-interface/inc/mm_lib2d.h
rename to msm8998/QCamera2/stack/mm-lib2d-interface/inc/mm_lib2d.h
diff --git a/msmcobalt/QCamera2/stack/mm-lib2d-interface/src/mm_lib2d.c b/msm8998/QCamera2/stack/mm-lib2d-interface/src/mm_lib2d.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-lib2d-interface/src/mm_lib2d.c
rename to msm8998/QCamera2/stack/mm-lib2d-interface/src/mm_lib2d.c
diff --git a/msmcobalt/QCamera2/stack/mm-lib2d-interface/test/Android.mk b/msm8998/QCamera2/stack/mm-lib2d-interface/test/Android.mk
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-lib2d-interface/test/Android.mk
rename to msm8998/QCamera2/stack/mm-lib2d-interface/test/Android.mk
diff --git a/msmcobalt/QCamera2/stack/mm-lib2d-interface/test/mm_lib2d_test.c b/msm8998/QCamera2/stack/mm-lib2d-interface/test/mm_lib2d_test.c
similarity index 100%
rename from msmcobalt/QCamera2/stack/mm-lib2d-interface/test/mm_lib2d_test.c
rename to msm8998/QCamera2/stack/mm-lib2d-interface/test/mm_lib2d_test.c
diff --git a/msmcobalt/QCamera2/util/QCameraBufferMaps.cpp b/msm8998/QCamera2/util/QCameraBufferMaps.cpp
similarity index 100%
rename from msmcobalt/QCamera2/util/QCameraBufferMaps.cpp
rename to msm8998/QCamera2/util/QCameraBufferMaps.cpp
diff --git a/msmcobalt/QCamera2/util/QCameraBufferMaps.h b/msm8998/QCamera2/util/QCameraBufferMaps.h
similarity index 100%
rename from msmcobalt/QCamera2/util/QCameraBufferMaps.h
rename to msm8998/QCamera2/util/QCameraBufferMaps.h
diff --git a/msmcobalt/QCamera2/util/QCameraCmdThread.cpp b/msm8998/QCamera2/util/QCameraCmdThread.cpp
similarity index 100%
rename from msmcobalt/QCamera2/util/QCameraCmdThread.cpp
rename to msm8998/QCamera2/util/QCameraCmdThread.cpp
diff --git a/msmcobalt/QCamera2/util/QCameraCmdThread.h b/msm8998/QCamera2/util/QCameraCmdThread.h
similarity index 100%
rename from msmcobalt/QCamera2/util/QCameraCmdThread.h
rename to msm8998/QCamera2/util/QCameraCmdThread.h
diff --git a/msmcobalt/QCamera2/util/QCameraCommon.cpp b/msm8998/QCamera2/util/QCameraCommon.cpp
similarity index 100%
rename from msmcobalt/QCamera2/util/QCameraCommon.cpp
rename to msm8998/QCamera2/util/QCameraCommon.cpp
diff --git a/msmcobalt/QCamera2/util/QCameraCommon.h b/msm8998/QCamera2/util/QCameraCommon.h
similarity index 100%
rename from msmcobalt/QCamera2/util/QCameraCommon.h
rename to msm8998/QCamera2/util/QCameraCommon.h
diff --git a/msmcobalt/QCamera2/util/QCameraDisplay.cpp b/msm8998/QCamera2/util/QCameraDisplay.cpp
similarity index 100%
rename from msmcobalt/QCamera2/util/QCameraDisplay.cpp
rename to msm8998/QCamera2/util/QCameraDisplay.cpp
diff --git a/msmcobalt/QCamera2/util/QCameraDisplay.h b/msm8998/QCamera2/util/QCameraDisplay.h
similarity index 100%
rename from msmcobalt/QCamera2/util/QCameraDisplay.h
rename to msm8998/QCamera2/util/QCameraDisplay.h
diff --git a/msmcobalt/QCamera2/util/QCameraFOVControl.cpp b/msm8998/QCamera2/util/QCameraFOVControl.cpp
similarity index 100%
rename from msmcobalt/QCamera2/util/QCameraFOVControl.cpp
rename to msm8998/QCamera2/util/QCameraFOVControl.cpp
diff --git a/msmcobalt/QCamera2/util/QCameraFOVControl.h b/msm8998/QCamera2/util/QCameraFOVControl.h
similarity index 100%
rename from msmcobalt/QCamera2/util/QCameraFOVControl.h
rename to msm8998/QCamera2/util/QCameraFOVControl.h
diff --git a/msmcobalt/QCamera2/util/QCameraFlash.cpp b/msm8998/QCamera2/util/QCameraFlash.cpp
similarity index 100%
rename from msmcobalt/QCamera2/util/QCameraFlash.cpp
rename to msm8998/QCamera2/util/QCameraFlash.cpp
diff --git a/msmcobalt/QCamera2/util/QCameraFlash.h b/msm8998/QCamera2/util/QCameraFlash.h
similarity index 100%
rename from msmcobalt/QCamera2/util/QCameraFlash.h
rename to msm8998/QCamera2/util/QCameraFlash.h
diff --git a/msmcobalt/QCamera2/util/QCameraPerf.cpp b/msm8998/QCamera2/util/QCameraPerf.cpp
similarity index 100%
rename from msmcobalt/QCamera2/util/QCameraPerf.cpp
rename to msm8998/QCamera2/util/QCameraPerf.cpp
diff --git a/msmcobalt/QCamera2/util/QCameraPerf.h b/msm8998/QCamera2/util/QCameraPerf.h
similarity index 100%
rename from msmcobalt/QCamera2/util/QCameraPerf.h
rename to msm8998/QCamera2/util/QCameraPerf.h
diff --git a/msmcobalt/QCamera2/util/QCameraQueue.cpp b/msm8998/QCamera2/util/QCameraQueue.cpp
similarity index 100%
rename from msmcobalt/QCamera2/util/QCameraQueue.cpp
rename to msm8998/QCamera2/util/QCameraQueue.cpp
diff --git a/msmcobalt/QCamera2/util/QCameraQueue.h b/msm8998/QCamera2/util/QCameraQueue.h
similarity index 100%
rename from msmcobalt/QCamera2/util/QCameraQueue.h
rename to msm8998/QCamera2/util/QCameraQueue.h
diff --git a/msmcobalt/QCamera2/util/QCameraTrace.cpp b/msm8998/QCamera2/util/QCameraTrace.cpp
similarity index 100%
rename from msmcobalt/QCamera2/util/QCameraTrace.cpp
rename to msm8998/QCamera2/util/QCameraTrace.cpp
diff --git a/msmcobalt/QCamera2/util/QCameraTrace.h b/msm8998/QCamera2/util/QCameraTrace.h
similarity index 100%
rename from msmcobalt/QCamera2/util/QCameraTrace.h
rename to msm8998/QCamera2/util/QCameraTrace.h
diff --git a/msmcobalt/QCamera2/util/camscope_packet_type.cpp b/msm8998/QCamera2/util/camscope_packet_type.cpp
similarity index 100%
rename from msmcobalt/QCamera2/util/camscope_packet_type.cpp
rename to msm8998/QCamera2/util/camscope_packet_type.cpp
diff --git a/msmcobalt/QCameraParameters.h b/msm8998/QCameraParameters.h
similarity index 100%
rename from msmcobalt/QCameraParameters.h
rename to msm8998/QCameraParameters.h
diff --git a/msmcobalt/QCamera_Intf.h b/msm8998/QCamera_Intf.h
similarity index 100%
rename from msmcobalt/QCamera_Intf.h
rename to msm8998/QCamera_Intf.h
diff --git a/msmcobalt/common.mk b/msm8998/common.mk
similarity index 100%
rename from msmcobalt/common.mk
rename to msm8998/common.mk
diff --git a/msmcobalt/mm-image-codec/Android.mk b/msm8998/mm-image-codec/Android.mk
similarity index 100%
rename from msmcobalt/mm-image-codec/Android.mk
rename to msm8998/mm-image-codec/Android.mk
diff --git a/msmcobalt/mm-image-codec/qexif/qexif.h b/msm8998/mm-image-codec/qexif/qexif.h
similarity index 100%
rename from msmcobalt/mm-image-codec/qexif/qexif.h
rename to msm8998/mm-image-codec/qexif/qexif.h
diff --git a/msmcobalt/mm-image-codec/qexif/qmpo.h b/msm8998/mm-image-codec/qexif/qmpo.h
similarity index 100%
rename from msmcobalt/mm-image-codec/qexif/qmpo.h
rename to msm8998/mm-image-codec/qexif/qmpo.h
diff --git a/msmcobalt/mm-image-codec/qomx_core/Android.mk b/msm8998/mm-image-codec/qomx_core/Android.mk
similarity index 100%
rename from msmcobalt/mm-image-codec/qomx_core/Android.mk
rename to msm8998/mm-image-codec/qomx_core/Android.mk
diff --git a/msmcobalt/mm-image-codec/qomx_core/QOMX_JpegExtensions.h b/msm8998/mm-image-codec/qomx_core/QOMX_JpegExtensions.h
similarity index 100%
rename from msmcobalt/mm-image-codec/qomx_core/QOMX_JpegExtensions.h
rename to msm8998/mm-image-codec/qomx_core/QOMX_JpegExtensions.h
diff --git a/msmcobalt/mm-image-codec/qomx_core/qomx_core.c b/msm8998/mm-image-codec/qomx_core/qomx_core.c
similarity index 100%
rename from msmcobalt/mm-image-codec/qomx_core/qomx_core.c
rename to msm8998/mm-image-codec/qomx_core/qomx_core.c
diff --git a/msmcobalt/mm-image-codec/qomx_core/qomx_core.h b/msm8998/mm-image-codec/qomx_core/qomx_core.h
similarity index 100%
rename from msmcobalt/mm-image-codec/qomx_core/qomx_core.h
rename to msm8998/mm-image-codec/qomx_core/qomx_core.h
diff --git a/msmcobalt/usbcamcore/inc/QCameraMjpegDecode.h b/msm8998/usbcamcore/inc/QCameraMjpegDecode.h
similarity index 100%
rename from msmcobalt/usbcamcore/inc/QCameraMjpegDecode.h
rename to msm8998/usbcamcore/inc/QCameraMjpegDecode.h
diff --git a/msmcobalt/usbcamcore/inc/QCameraUsbParm.h b/msm8998/usbcamcore/inc/QCameraUsbParm.h
similarity index 100%
rename from msmcobalt/usbcamcore/inc/QCameraUsbParm.h
rename to msm8998/usbcamcore/inc/QCameraUsbParm.h
diff --git a/msmcobalt/usbcamcore/inc/QCameraUsbPriv.h b/msm8998/usbcamcore/inc/QCameraUsbPriv.h
similarity index 100%
rename from msmcobalt/usbcamcore/inc/QCameraUsbPriv.h
rename to msm8998/usbcamcore/inc/QCameraUsbPriv.h
diff --git a/msmcobalt/usbcamcore/inc/QualcommUsbCamera.h b/msm8998/usbcamcore/inc/QualcommUsbCamera.h
similarity index 100%
rename from msmcobalt/usbcamcore/inc/QualcommUsbCamera.h
rename to msm8998/usbcamcore/inc/QualcommUsbCamera.h
diff --git a/msmcobalt/usbcamcore/src/QCameraMjpegDecode.cpp b/msm8998/usbcamcore/src/QCameraMjpegDecode.cpp
similarity index 100%
rename from msmcobalt/usbcamcore/src/QCameraMjpegDecode.cpp
rename to msm8998/usbcamcore/src/QCameraMjpegDecode.cpp
diff --git a/msmcobalt/usbcamcore/src/QCameraUsbParm.cpp b/msm8998/usbcamcore/src/QCameraUsbParm.cpp
similarity index 100%
rename from msmcobalt/usbcamcore/src/QCameraUsbParm.cpp
rename to msm8998/usbcamcore/src/QCameraUsbParm.cpp
diff --git a/msmcobalt/usbcamcore/src/QualcommUsbCamera.cpp b/msm8998/usbcamcore/src/QualcommUsbCamera.cpp
similarity index 100%
rename from msmcobalt/usbcamcore/src/QualcommUsbCamera.cpp
rename to msm8998/usbcamcore/src/QualcommUsbCamera.cpp